Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / rfkill / rfkill-input.c

diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index 9d6c9255bf2cfe9ebd8dfc125a37091d4bb4cda0..8aa82273014516a14a8184bd44cdcdff70f972af 100644 (file)
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -30,36 +30,39 @@ 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);
 }
 
+static void rfkill_task_epo_handler(struct work_struct *work)
+{
+       rfkill_epo();
+}
+
+static DECLARE_WORK(epo_work, rfkill_task_epo_handler);
+
+static void rfkill_schedule_epo(void)
+{
+       schedule_work(&epo_work);
+}
+
 static void rfkill_schedule_set(struct rfkill_task *task,
                                enum rfkill_state desired_state)
 {
        unsigned long flags;
 
+       if (unlikely(work_pending(&epo_work)))
+               return;
+
        spin_lock_irqsave(&task->lock, flags);
 
        if (time_after(jiffies, task->last + msecs_to_jiffies(200))) {
@@ -75,10 +78,14 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
 {
        unsigned long flags;
 
+       if (unlikely(work_pending(&epo_work)))
+               return;
+
        spin_lock_irqsave(&task->lock, flags);
 
        if (time_after(jiffies, task->last + msecs_to_jiffies(200))) {
-               task->desired_state = !task->desired_state;
+               task->desired_state =
+                               rfkill_state_complement(task->desired_state);
                task->last = jiffies;
                schedule_work(&task->work);
        }
@@ -86,21 +93,21 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
        spin_unlock_irqrestore(&task->lock, flags);
 }
 
-#define DEFINE_RFKILL_TASK(n, t)                       \
-       struct rfkill_task n = {                        \
-               .work = __WORK_INITIALIZER(n.work,      \
-                               rfkill_task_handler),   \
-               .type = t,                              \
-               .mutex = __MUTEX_INITIALIZER(n.mutex),  \
-               .lock = __SPIN_LOCK_UNLOCKED(n.lock),   \
-               .desired_state = RFKILL_STATE_ON,       \
-               .current_state = RFKILL_STATE_ON,       \
+#define DEFINE_RFKILL_TASK(n, t)                               \
+       struct rfkill_task n = {                                \
+               .work = __WORK_INITIALIZER(n.work,              \
+                               rfkill_task_handler),           \
+               .type = t,                                      \
+               .mutex = __MUTEX_INITIALIZER(n.mutex),          \
+               .lock = __SPIN_LOCK_UNLOCKED(n.lock),           \
+               .desired_state = RFKILL_STATE_UNBLOCKED,        \
        }
 
 static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
 static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);
 static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);
 static DEFINE_RFKILL_TASK(rfkill_wimax, RFKILL_TYPE_WIMAX);
+static DEFINE_RFKILL_TASK(rfkill_wwan, RFKILL_TYPE_WWAN);
 
 static void rfkill_event(struct input_handle *handle, unsigned int type,
                        unsigned int code, int data)
@@ -126,18 +133,20 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
                switch (code) {
                case SW_RFKILL_ALL:
                        /* EVERY radio type. data != 0 means radios ON */
-                       rfkill_schedule_set(&rfkill_wimax,
-                                           (data)? RFKILL_STATE_ON:
-                                                   RFKILL_STATE_OFF);
-                       rfkill_schedule_set(&rfkill_uwb,
-                                           (data)? RFKILL_STATE_ON:
-                                                   RFKILL_STATE_OFF);
-                       rfkill_schedule_set(&rfkill_bt,
-                                           (data)? RFKILL_STATE_ON:
-                                                   RFKILL_STATE_OFF);
-                       rfkill_schedule_set(&rfkill_wlan,
-                                           (data)? RFKILL_STATE_ON:
-                                                   RFKILL_STATE_OFF);
+                       /* handle EPO (emergency power off) through shortcut */
+                       if (data) {
+                               rfkill_schedule_set(&rfkill_wwan,
+                                                   RFKILL_STATE_UNBLOCKED);
+                               rfkill_schedule_set(&rfkill_wimax,
+                                                   RFKILL_STATE_UNBLOCKED);
+                               rfkill_schedule_set(&rfkill_uwb,
+                                                   RFKILL_STATE_UNBLOCKED);
+                               rfkill_schedule_set(&rfkill_bt,
+                                                   RFKILL_STATE_UNBLOCKED);
+                               rfkill_schedule_set(&rfkill_wlan,
+                                                   RFKILL_STATE_UNBLOCKED);
+                       } else
+                               rfkill_schedule_epo();
                        break;
                default:
                        break;