[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, 20 insertions, 20 deletions

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 5301ac60358f..6da4a03d68e4 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -61,7 +61,7 @@ struct socket_data {
         unsigned int                    rsrc_mem_probe;
 };
 
-static DECLARE_MUTEX(rsrc_sem);
+static DEFINE_MUTEX(rsrc_mutex);
 #define MEM_PROBE_LOW   (1 << 0)
 #define MEM_PROBE_HIGH  (1 << 1)
 
@@ -484,7 +484,7 @@ static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
 
 
 /*
- * Locking note: Must be called with skt_sem held!
+ * Locking note: Must be called with skt_mutex held!
  */
 static int pcmcia_nonstatic_validate_mem(struct pcmcia_socket *s)
 {
@@ -495,7 +495,7 @@ static int pcmcia_nonstatic_validate_mem(struct pcmcia_socket *s)
         if (!probe_mem)
                 return 0;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
 
         if (s->features & SS_CAP_PAGE_REGS)
                 probe_mask = MEM_PROBE_HIGH;
@@ -507,7 +507,7 @@ static int pcmcia_nonstatic_validate_mem(struct pcmcia_socket *s)
                         s_data->rsrc_mem_probe |= probe_mask;
         }
 
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 
         return ret;
 }
@@ -585,7 +585,7 @@ static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_star
         struct socket_data *s_data = s->resource_data;
         int ret = -ENOMEM;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         for (m = s_data->io_db.next; m != &s_data->io_db; m = m->next) {
                 unsigned long start = m->base;
                 unsigned long end = m->base + m->num - 1;
@@ -596,7 +596,7 @@ static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_star
                 ret = adjust_resource(res, r_start, r_end - r_start + 1);
                 break;
         }
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 
         return ret;
 }
@@ -630,7 +630,7 @@ static struct resource *nonstatic_find_io_region(unsigned long base, int num,
         data.offset = base & data.mask;
         data.map = &s_data->io_db;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
 #ifdef CONFIG_PCI
         if (s->cb_dev) {
                 ret = pci_bus_alloc_resource(s->cb_dev->bus, res, num, 1,
@@ -639,7 +639,7 @@ static struct resource *nonstatic_find_io_region(unsigned long base, int num,
 #endif
                 ret = allocate_resource(&ioport_resource, res, num, min, ~0UL,
                                         1, pcmcia_align, &data);
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 
         if (ret != 0) {
                 kfree(res);
@@ -672,7 +672,7 @@ static struct resource * nonstatic_find_mem_region(u_long base, u_long num,
                         min = 0x100000UL + base;
                 }
 
-                down(&rsrc_sem);
+                mutex_lock(&rsrc_mutex);
 #ifdef CONFIG_PCI
                 if (s->cb_dev) {
                         ret = pci_bus_alloc_resource(s->cb_dev->bus, res, num,
@@ -682,7 +682,7 @@ static struct resource * nonstatic_find_mem_region(u_long base, u_long num,
 #endif
                         ret = allocate_resource(&iomem_resource, res, num, min,
                                                 max, 1, pcmcia_align, &data);
-                up(&rsrc_sem);
+                mutex_unlock(&rsrc_mutex);
                 if (ret == 0 || low)
                         break;
                 low = 1;
@@ -705,7 +705,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned
         if (end < start)
                 return -EINVAL;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         switch (action) {
         case ADD_MANAGED_RESOURCE:
                 ret = add_interval(&data->mem_db, start, size);
@@ -723,7 +723,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned
         default:
                 ret = -EINVAL;
         }
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 
         return ret;
 }
@@ -741,7 +741,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
         if (end > IO_SPACE_LIMIT)
                 return -EINVAL;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         switch (action) {
         case ADD_MANAGED_RESOURCE:
                 if (add_interval(&data->io_db, start, size) != 0) {
@@ -760,7 +760,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
                 ret = -EINVAL;
                 break;
         }
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 
         return ret;
 }
@@ -867,7 +867,7 @@ static void nonstatic_release_resource_db(struct pcmcia_socket *s)
         struct socket_data *data = s->resource_data;
         struct resource_map *p, *q;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         for (p = data->mem_db.next; p != &data->mem_db; p = q) {
                 q = p->next;
                 kfree(p);
@@ -876,7 +876,7 @@ static void nonstatic_release_resource_db(struct pcmcia_socket *s)
                 q = p->next;
                 kfree(p);
         }
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
 }
 
 
@@ -901,7 +901,7 @@ static ssize_t show_io_db(struct class_device *class_dev, char *buf)
         struct resource_map *p;
         ssize_t ret = 0;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         data = s->resource_data;
 
         for (p = data->io_db.next; p != &data->io_db; p = p->next) {
@@ -913,7 +913,7 @@ static ssize_t show_io_db(struct class_device *class_dev, char *buf)
                                  ((unsigned long) p->base + p->num - 1));
         }
 
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
         return (ret);
 }
 
@@ -953,7 +953,7 @@ static ssize_t show_mem_db(struct class_device *class_dev, char *buf)
         struct resource_map *p;
         ssize_t ret = 0;
 
-        down(&rsrc_sem);
+        mutex_lock(&rsrc_mutex);
         data = s->resource_data;
 
         for (p = data->mem_db.next; p != &data->mem_db; p = p->next) {
@@ -965,7 +965,7 @@ static ssize_t show_mem_db(struct class_device *class_dev, char *buf)
                                  ((unsigned long) p->base + p->num - 1));
         }
 
-        up(&rsrc_sem);
+        mutex_unlock(&rsrc_mutex);
         return (ret);
 }