forked from Minki/linux
staging: vchiq_core: Simplify VCHIQ init
Since the ARM side of VCHIQ support only 1 state, we could simplify the init code. This makes it possible to avoid BUG_ON and a theoretical overflow of id. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
244156ca90
commit
7c35c6af0c
@ -2349,7 +2349,6 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
|
||||
VCHIQ_SHARED_STATE_T *remote;
|
||||
VCHIQ_STATUS_T status;
|
||||
char threadname[16];
|
||||
static int id;
|
||||
int i;
|
||||
|
||||
vchiq_log_warning(vchiq_core_log_level,
|
||||
@ -2437,7 +2436,6 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
|
||||
|
||||
memset(state, 0, sizeof(VCHIQ_STATE_T));
|
||||
|
||||
state->id = id++;
|
||||
state->is_master = is_master;
|
||||
|
||||
/*
|
||||
@ -2556,8 +2554,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
|
||||
set_user_nice(state->sync_thread, -20);
|
||||
wake_up_process(state->sync_thread);
|
||||
|
||||
BUG_ON(state->id >= VCHIQ_MAX_STATES);
|
||||
vchiq_states[state->id] = state;
|
||||
vchiq_states[0] = state;
|
||||
|
||||
/* Indicate readiness to the other side */
|
||||
local->initialised = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user