[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <ae3a1b46099aa87f1662621580c985432ca1c9d9.1223706853.git.len.brown@intel.com>
Date: Sat, 11 Oct 2008 02:36:31 -0400
From: Len Brown <lenb@...nel.org>
To: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Carlos Corbacho <carlos@...angeworlds.co.uk>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Len Brown <len.brown@...el.com>
Subject: [PATCH 71/85] acer-wmi: Remove private workqueue
From: Carlos Corbacho <carlos@...angeworlds.co.uk>
As per Dmitry Torokhov's suggestion, acer-wmi doesn't need a private
workqueue, so remove it.
Signed-off-by: Carlos Corbacho <carlos@...angeworlds.co.uk>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>
Signed-off-by: Len Brown <len.brown@...el.com>
---
drivers/misc/acer-wmi.c | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 8708d31..cf4c39f 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -930,8 +930,6 @@ static void acer_backlight_exit(void)
/*
* Rfkill devices
*/
-static struct workqueue_struct *rfkill_workqueue;
-
static void acer_rfkill_update(struct work_struct *ignored);
static DECLARE_DELAYED_WORK(acer_rfkill_work, acer_rfkill_update);
static void acer_rfkill_update(struct work_struct *ignored)
@@ -952,8 +950,7 @@ static void acer_rfkill_update(struct work_struct *ignored)
RFKILL_STATE_SOFT_BLOCKED);
}
- queue_delayed_work(rfkill_workqueue, &acer_rfkill_work,
- round_jiffies_relative(HZ));
+ schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ));
}
static int acer_rfkill_set(void *data, enum rfkill_state state)
@@ -1018,17 +1015,7 @@ static int acer_rfkill_init(struct device *dev)
}
}
- rfkill_workqueue = create_singlethread_workqueue("rfkill_workqueue");
- if (!rfkill_workqueue) {
- if (has_cap(ACER_CAP_BLUETOOTH)) {
- kfree(bluetooth_rfkill->data);
- rfkill_unregister(bluetooth_rfkill);
- }
- kfree(wireless_rfkill->data);
- rfkill_unregister(wireless_rfkill);
- return -ENOMEM;
- }
- queue_delayed_work(rfkill_workqueue, &acer_rfkill_work, HZ);
+ schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ));
return 0;
}
@@ -1036,7 +1023,6 @@ static int acer_rfkill_init(struct device *dev)
static void acer_rfkill_exit(void)
{
cancel_delayed_work_sync(&acer_rfkill_work);
- destroy_workqueue(rfkill_workqueue);
kfree(wireless_rfkill->data);
rfkill_unregister(wireless_rfkill);
if (has_cap(ACER_CAP_BLUETOOTH)) {
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists