From 6385c0463064488d789775918d988d74f02a0e31 Mon Sep 17 00:00:00 2001 From: Komal Shah Date: Tue, 2 Jan 2007 11:51:29 -0800 Subject: [PATCH] ARM: OMAP: Fix workqueue changes for menelaus.c Signed-off-by: Komal Shah Signed-off-by: Tony Lindgren --- drivers/i2c/chips/menelaus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index aeb789cf8ab..79e9625ad9d 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -129,7 +130,7 @@ #define MENELAUS_RESERVED14_IRQ 14 /* Reserved */ #define MENELAUS_RESERVED15_IRQ 15 /* Reserved */ -static void menelaus_work(void * _menelaus); +static void menelaus_work(struct work_struct *_menelaus); /* Initialized by menelaus_init */ static unsigned short normal_i2c[] = { MENELAUS_I2C_ADDRESS, I2C_CLIENT_END }; @@ -643,9 +644,10 @@ EXPORT_SYMBOL(menelaus_get_slot_pin_states); /*-----------------------------------------------------------------------*/ /* Handles Menelaus interrupts. Does not run in interrupt context */ -static void menelaus_work(void * _menelaus) +static void menelaus_work(struct work_struct *_menelaus) { - struct menelaus_chip *menelaus = _menelaus; + struct menelaus_chip *menelaus = + container_of(_menelaus, struct menelaus_chip, work); int (*handler)(struct menelaus_chip *menelaus); while (1) { @@ -739,7 +741,7 @@ static int menelaus_probe(struct i2c_adapter *adapter, int address, int kind) } mutex_init(&menelaus.lock); - INIT_WORK(&menelaus.work, menelaus_work, &menelaus); + INIT_WORK(&menelaus.work, menelaus_work); if (kind < 0) pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f); -- 2.41.1