[PATCH] ARM: OMAP: Fix workqueue changes for menelaus.c

[PATCH] ARM: OMAP: Fix workqueue changes for menelaus.c

[Komal Shah]

[-- Attachment #1: Type: text/plain, Size: 111 bytes --]

compile tested only. Please test if one has access to H4 EVM.

-- 
---Komal Shah
http://komalshah.blogspot.com

[-- Attachment #2: 0001-ARM-OMAP-Fix-workqueue-changes-for-menelaus.c.txt --]
[-- Type: text/plain, Size: 1901 bytes --]

From 155b6ea9640abba14c2be7a3e05e60e7a8c846c2 Mon Sep 17 00:00:00 2001
From: Komal Shah <komal_shah802003@yahoo.com>
Date: Sat, 23 Dec 2006 20:21:10 +0530
Subject: [PATCH] ARM: OMAP: Fix workqueue changes for menelaus.c

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
---
 drivers/i2c/chips/menelaus.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index aeb789c..79e9625 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -36,6 +36,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/irq.h>
@@ -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_stat
 /*-----------------------------------------------------------------------*/
 
 /* 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_ada
 	}
 
 	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);
-- 
1.4.3.4.g82cc


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ARM: OMAP: Fix workqueue changes for menelaus.c

[tony]

* Komal Shah <komal.shah802003@gmail.com> [061223 07:00]:
> compile tested only. Please test if one has access to H4 EVM.

Pushing today.

Tony