pcmcia: simplify locking

replace pcmcia_socket->lock and pcmcia_dev_list_lock by using the
per-socket "ops_mutex", as we do neither need different locks
nor a spinlock here.

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index cdd30c18006..b81586622d0 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -23,14 +23,12 @@
 
 static int static_init(struct pcmcia_socket *s)
 {
-        unsigned long flags;
-
         /* the good thing about SS_CAP_STATIC_MAP sockets is
          * that they don't need a resource database */
 
-        spin_lock_irqsave(&s->lock, flags);
+        mutex_lock(&s->ops_mutex);
         s->resource_setup_done = 1;
-        spin_unlock_irqrestore(&s->lock, flags);
+        mutex_unlock(&s->ops_mutex);
 
         return 0;
 }