The m41t00 i2c/rtc driver currently uses a tasklet to schedule interrupt-level
writes to the rtc. This patch causes the driver to use a workqueue instead.
Signed-off-by: Mark A. Greer <mgreer at mvista.com>
---
m41t00.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff -Nurp linux-2.6.16-mm1/drivers/i2c/chips/m41t00.c linux-2.6.16-mm1-wq/drivers/i2c/chips/m41t00.c
--- linux-2.6.16-mm1/drivers/i2c/chips/m41t00.c 2006-03-23 15:04:55.000000000 -0700
+++ linux-2.6.16-mm1-wq/drivers/i2c/chips/m41t00.c 2006-03-23 16:04:01.000000000 -0700
@@ -25,6 +25,7 @@
#include <linux/rtc.h>
#include <linux/bcd.h>
#include <linux/mutex.h>
+#include <linux/workqueue.h>
#include <asm/time.h>
#include <asm/rtc.h>
@@ -32,6 +33,7 @@
#define M41T00_DRV_NAME "m41t00"
static DEFINE_MUTEX(m41t00_mutex);
+static struct work_struct set_rtc_time_task;
static struct i2c_driver m41t00_driver;
static struct i2c_client *save_client;
@@ -111,7 +113,7 @@ m41t00_get_rtc_time(void)
}
static void
-m41t00_set_tlet(ulong arg)
+m41t00_set(void *arg)
{
struct rtc_time tm;
ulong nowtime = *(ulong *)arg;
@@ -147,17 +149,15 @@ m41t00_set_tlet(ulong arg)
static ulong new_time;
-DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
-
int
m41t00_set_rtc_time(ulong nowtime)
{
new_time = nowtime;
if (in_interrupt())
- tasklet_schedule(&m41t00_tasklet);
+ schedule_work(&set_rtc_time_task);
else
- m41t00_set_tlet((ulong)&new_time);
+ m41t00_set((void *)&new_time);
return 0;
}
@@ -189,6 +189,7 @@ m41t00_probe(struct i2c_adapter *adap, i
return rc;
}
+ INIT_WORK(&set_rtc_time_task, &m41t00_set, &new_time);
save_client = client;
return 0;
}
@@ -206,7 +207,7 @@ m41t00_detach(struct i2c_client *client)
if ((rc = i2c_detach_client(client)) == 0) {
kfree(client);
- tasklet_kill(&m41t00_tasklet);
+ flush_scheduled_work();
}
return rc;
}
