Commit b33050d0 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman

staging: vc04_services: Fix space issues

This fixes the space coding styles issues complained by checkpatch.
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f306ed07
...@@ -203,11 +203,11 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state) ...@@ -203,11 +203,11 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state)
{ {
VCHIQ_STATUS_T status = VCHIQ_SUCCESS; VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
state->platform_state = kzalloc(sizeof(VCHIQ_2835_ARM_STATE_T), GFP_KERNEL); state->platform_state = kzalloc(sizeof(VCHIQ_2835_ARM_STATE_T), GFP_KERNEL);
((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited = 1; ((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited = 1;
status = vchiq_arm_init_state(state, &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state); status = vchiq_arm_init_state(state, &((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->arm_state);
if(status != VCHIQ_SUCCESS) if (status != VCHIQ_SUCCESS)
{ {
((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited = 0; ((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited = 0;
} }
return status; return status;
} }
...@@ -215,11 +215,11 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state) ...@@ -215,11 +215,11 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state)
VCHIQ_ARM_STATE_T* VCHIQ_ARM_STATE_T*
vchiq_platform_get_arm_state(VCHIQ_STATE_T *state) vchiq_platform_get_arm_state(VCHIQ_STATE_T *state)
{ {
if(!((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited) if (!((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited)
{ {
BUG(); BUG();
} }
return &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state; return &((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->arm_state;
} }
void void
...@@ -315,7 +315,7 @@ vchiq_platform_resumed(VCHIQ_STATE_T *state) ...@@ -315,7 +315,7 @@ vchiq_platform_resumed(VCHIQ_STATE_T *state)
} }
int int
vchiq_platform_videocore_wanted(VCHIQ_STATE_T* state) vchiq_platform_videocore_wanted(VCHIQ_STATE_T *state)
{ {
return 1; // autosuspend not supported - videocore always wanted return 1; // autosuspend not supported - videocore always wanted
} }
......
...@@ -1996,7 +1996,7 @@ block_resume(VCHIQ_ARM_STATE_T *arm_state) ...@@ -1996,7 +1996,7 @@ block_resume(VCHIQ_ARM_STATE_T *arm_state)
&arm_state->blocked_blocker, timeout_val) &arm_state->blocked_blocker, timeout_val)
<= 0) { <= 0) {
vchiq_log_error(vchiq_susp_log_level, "%s wait for " vchiq_log_error(vchiq_susp_log_level, "%s wait for "
"previously blocked clients failed" , __func__); "previously blocked clients failed", __func__);
status = VCHIQ_ERROR; status = VCHIQ_ERROR;
write_lock_bh(&arm_state->susp_res_lock); write_lock_bh(&arm_state->susp_res_lock);
goto out; goto out;
...@@ -2012,7 +2012,7 @@ block_resume(VCHIQ_ARM_STATE_T *arm_state) ...@@ -2012,7 +2012,7 @@ block_resume(VCHIQ_ARM_STATE_T *arm_state)
if (resume_count > 1) { if (resume_count > 1) {
status = VCHIQ_ERROR; status = VCHIQ_ERROR;
vchiq_log_error(vchiq_susp_log_level, "%s waited too " vchiq_log_error(vchiq_susp_log_level, "%s waited too "
"many times for resume" , __func__); "many times for resume", __func__);
goto out; goto out;
} }
write_unlock_bh(&arm_state->susp_res_lock); write_unlock_bh(&arm_state->susp_res_lock);
......
...@@ -81,17 +81,17 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out) ...@@ -81,17 +81,17 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
/* VideoCore may not be ready due to boot up timing. /* VideoCore may not be ready due to boot up timing.
It may never be ready if kernel and firmware are mismatched, so don't block forever. */ It may never be ready if kernel and firmware are mismatched, so don't block forever. */
for (i=0; i<VCHIQ_INIT_RETRIES; i++) { for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
state = vchiq_get_state(); state = vchiq_get_state();
if (state) if (state)
break; break;
udelay(500); udelay(500);
} }
if (i==VCHIQ_INIT_RETRIES) { if (i == VCHIQ_INIT_RETRIES) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"%s: videocore not initialized\n", __func__); "%s: videocore not initialized\n", __func__);
goto failed; goto failed;
} else if (i>0) { } else if (i > 0) {
vchiq_log_warning(vchiq_core_log_level, vchiq_log_warning(vchiq_core_log_level,
"%s: videocore initialized after %d retries\n", __func__, i); "%s: videocore initialized after %d retries\n", __func__, i);
} }
......
...@@ -739,16 +739,16 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle, ...@@ -739,16 +739,16 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,
} }
EXPORT_SYMBOL(vchi_service_set_option); EXPORT_SYMBOL(vchi_service_set_option);
int32_t vchi_get_peer_version( const VCHI_SERVICE_HANDLE_T handle, short *peer_version ) int32_t vchi_get_peer_version(const VCHI_SERVICE_HANDLE_T handle, short *peer_version)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
if(service) if (service)
{ {
VCHIQ_STATUS_T status; VCHIQ_STATUS_T status;
status = vchiq_get_peer_version(service->handle, peer_version); status = vchiq_get_peer_version(service->handle, peer_version);
ret = vchiq_status_to_vchi( status ); ret = vchiq_status_to_vchi(status);
} }
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment