[PATCH] pcmcia: use mutexes instead of semaphores

Use mutexes in the PCMICA core, as they suffice for what needs to be done.
Includes a bugfix from and Signed-off-by Andrew Morton.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 5ab1cdef7c4..83c6b31133a 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -25,6 +25,7 @@
 #include <linux/pm.h>
 #include <linux/pci.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 
@@ -183,7 +184,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
                 s->resource_setup_done = 1;
         spin_unlock_irqrestore(&s->lock, flags);
 
-        down(&s->skt_sem);
+        mutex_lock(&s->skt_mutex);
         if ((s->callback) &&
             (s->state & SOCKET_PRESENT) &&
             !(s->state & SOCKET_CARDBUS)) {
@@ -192,7 +193,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
                         module_put(s->callback->owner);
                 }
         }
-        up(&s->skt_sem);
+        mutex_unlock(&s->skt_mutex);
 
         return count;
 }
@@ -322,7 +323,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
         kfree(cis);
 
         if (!ret) {
-                down(&s->skt_sem);
+                mutex_lock(&s->skt_mutex);
                 if ((s->callback) && (s->state & SOCKET_PRESENT) &&
                     !(s->state & SOCKET_CARDBUS)) {
                         if (try_module_get(s->callback->owner)) {
@@ -330,7 +331,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
                                 module_put(s->callback->owner);
                         }
                 }
-                up(&s->skt_sem);
+                mutex_unlock(&s->skt_mutex);
         }