OMAP: Menelaus: sem2mutex conversion
PATCH 1/1 OMAP: Menelaus: sem2mutex conversion
---Komal Shah
http://komalshah.blogspot.com/
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
Subject: [PATCH] OMAP: Menelaus: sem2mutex conversion
Signed-off-by Komal Shah <[email protected]>
---
drivers/i2c/chips/menelaus.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
ea50d76db43f835a43f9f31192d95406d2c7d647
drivers/i2c/chips/menelaus.c +9 -8
@@ -33,6 +33,7 @@#include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/sched.h> +#include <linux/mutex.h> #include <asm/mach-types.h> #include <asm/mach/irq.h>
@@ -133,7 +134,7 @@ I2C_CLIENT_INSMOD;struct menelaus_chip {unsigned long initialized; -struct semaphore lock; +struct mutex lock;struct i2c_client client;struct work_struct work;int irq;
@@ -193,10 +194,10 @@ static void menelaus_ack_irq(int irq)/* Adds a handler for an interrupt. Does not run in interrupt context */ static int menelaus_add_irq_work (int irq,void * handler) { -down (&menelaus.lock); +mutex_lock (&menelaus.lock); menelaus.handlers[irq] = handler;menelaus_enable_irq (irq); -up (&menelaus.lock); +mutex_unlock (&menelaus.lock);return 0 ; }
@@ -204,10 +205,10 @@ static int menelaus_add_irq_work(int irq/* Removes handler for an interrupt */ static void menelaus_remove_irq_work (int irq) { -down (&menelaus.lock); +mutex_lock (&menelaus.lock);menelaus_disable_irq (irq); menelaus.handlers[irq] =NULL ; -up (&menelaus.lock); +mutex_unlock (&menelaus.lock); }/*-----------------------------------------------------------------------*/
@@ -332,7 +333,7 @@ static void menelaus_work(void * _menelafor (i =0 ; i <IH_MENELAUS_IRQS ; i++) {if (isr & (1 << i)) { -down (&menelaus->lock); +mutex_lock (&menelaus->lock);menelaus_disable_irq (i);menelaus_ack_irq (i);if (menelaus->handlers[i]) {
@@ -340,7 +341,7 @@ static void menelaus_work(void * _menelahandler (menelaus); }menelaus_enable_irq (i); -up (&menelaus->lock); +mutex_unlock (&menelaus->lock); } } }
@@ -405,7 +406,7 @@ static int menelaus_probe(struct i2c_adaif (err)printk (KERN_ERR "Could not get Menelaus IRQ\n" ); -init_MUTEX (&menelaus.lock); +mutex_init (&menelaus.lock);INIT_WORK (&menelaus.work, menelaus_work, &menelaus);if (kind <0 )
Signature · 1 line
1.1.6