Skip to content

Commit

Permalink
rfkill: drop current_state from tasks in rfkill-input
Browse files Browse the repository at this point in the history
The whole current_state thing seems completely useless and a source of
problems in rfkill-input, since state comparison is already done in rfkill,
and rfkill-input is more than likely to become out of sync with the real
state.

Signed-off-by: Fabien Crespel <fabien@crespel.net>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Fabien Crespel authored and John W. Linville committed Jun 26, 2008
1 parent ffb67c3 commit fbc6af2
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions net/rfkill/rfkill-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,15 @@ struct rfkill_task {
spinlock_t lock; /* for accessing last and desired state */
unsigned long last; /* last schedule */
enum rfkill_state desired_state; /* on/off */
enum rfkill_state current_state; /* on/off */
};

static void rfkill_task_handler(struct work_struct *work)
{
struct rfkill_task *task = container_of(work, struct rfkill_task, work);
enum rfkill_state state;

mutex_lock(&task->mutex);

/*
* Use temp variable to fetch desired state to keep it
* consistent even if rfkill_schedule_toggle() runs in
* another thread or interrupts us.
*/
state = task->desired_state;

if (state != task->current_state) {
rfkill_switch_all(task->type, state);
task->current_state = state;
}
rfkill_switch_all(task->type, task->desired_state);

mutex_unlock(&task->mutex);
}
Expand Down Expand Up @@ -94,7 +82,6 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
.mutex = __MUTEX_INITIALIZER(n.mutex), \
.lock = __SPIN_LOCK_UNLOCKED(n.lock), \
.desired_state = RFKILL_STATE_ON, \
.current_state = RFKILL_STATE_ON, \
}

static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
Expand Down

0 comments on commit fbc6af2

Please sign in to comment.