4 files changed, 29 insertions, 27 deletions

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index c8873b0ca551..3151fd164614 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -3,7 +3,7 @@
  *      Bjorn Helgaas <bjorn.helgaas@hp.com>
  */
 
-extern spinlock_t pnp_lock;
+extern struct mutex pnp_lock;
 extern const struct attribute_group *pnp_dev_groups[];
 void *pnp_alloc(long size);
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 874c236ac1a7..31ad9fc3f701 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
@@ -244,10 +245,10 @@ int pnp_add_card(struct pnp_card *card)
         }
 
         pnp_interface_attach_card(card);
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_add_tail(&card->global_list, &pnp_cards);
         list_add_tail(&card->protocol_list, &card->protocol->cards);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
 
         /* we wait until now to add devices in order to ensure the drivers
          * will be able to use all of the related devices on the card
@@ -276,10 +277,10 @@ void pnp_remove_card(struct pnp_card *card)
         struct list_head *pos, *temp;
 
         device_unregister(&card->dev);
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_del(&card->global_list);
         list_del(&card->protocol_list);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         list_for_each_safe(pos, temp, &card->devices) {
                 struct pnp_dev *dev = card_to_pnp_dev(pos);
                 pnp_remove_card_device(dev);
@@ -297,10 +298,10 @@ int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev)
         dev->card_link = NULL;
         dev_set_name(&dev->dev, "%02x:%02x.%02x",
                      dev->protocol->number, card->number, dev->number);
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         dev->card = card;
         list_add_tail(&dev->card_list, &card->devices);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         return 0;
 }
 
@@ -310,10 +311,10 @@ int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev)
  */
 void pnp_remove_card_device(struct pnp_dev *dev)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         dev->card = NULL;
         list_del(&dev->card_list);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         __pnp_remove_device(dev);
 }
 
@@ -426,9 +427,9 @@ int pnp_register_card_driver(struct pnp_card_driver *drv)
         if (error < 0)
                 return error;
 
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_add_tail(&drv->global_list, &pnp_card_drivers);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
 
         list_for_each_safe(pos, temp, &pnp_cards) {
                 struct pnp_card *card =
@@ -444,9 +445,9 @@ int pnp_register_card_driver(struct pnp_card_driver *drv)
  */
 void pnp_unregister_card_driver(struct pnp_card_driver *drv)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_del(&drv->global_list);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         pnp_unregister_driver(&drv->link);
 }
 
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index cb6ce42f8e77..ef2f59c4e57c 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -9,6 +9,7 @@
 #include <linux/list.h>
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -19,7 +20,7 @@
 
 static LIST_HEAD(pnp_protocols);
 LIST_HEAD(pnp_global);
-DEFINE_SPINLOCK(pnp_lock);
+DEFINE_MUTEX(pnp_lock);
 
 /*
  * ACPI or PNPBIOS should tell us about all platform devices, so we can
@@ -55,7 +56,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
         INIT_LIST_HEAD(&protocol->devices);
         INIT_LIST_HEAD(&protocol->cards);
         nodenum = 0;
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
 
         /* assign the lowest unused number */
         list_for_each(pos, &pnp_protocols) {
@@ -67,7 +68,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
         }
 
         list_add_tail(&protocol->protocol_list, &pnp_protocols);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
 
         protocol->number = nodenum;
         dev_set_name(&protocol->dev, "pnp%d", nodenum);
@@ -80,9 +81,9 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
  */
 void pnp_unregister_protocol(struct pnp_protocol *protocol)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_del(&protocol->protocol_list);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         device_unregister(&protocol->dev);
 }
 
@@ -161,10 +162,10 @@ int __pnp_add_device(struct pnp_dev *dev)
 {
         pnp_fixup_device(dev);
         dev->status = PNP_READY;
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_add_tail(&dev->global_list, &pnp_global);
         list_add_tail(&dev->protocol_list, &dev->protocol->devices);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         if (dev->protocol->can_wakeup)
                 device_set_wakeup_capable(&dev->dev,
                                 dev->protocol->can_wakeup(dev));
@@ -203,10 +204,10 @@ int pnp_add_device(struct pnp_dev *dev)
 
 void __pnp_remove_device(struct pnp_dev *dev)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         list_del(&dev->global_list);
         list_del(&dev->protocol_list);
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         device_unregister(&dev->dev);
 }
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 4e57d3370368..153a493b5413 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -58,22 +58,22 @@ static const struct pnp_device_id *match_device(struct pnp_driver *drv,
 
 int pnp_device_attach(struct pnp_dev *pnp_dev)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         if (pnp_dev->status != PNP_READY) {
-                spin_unlock(&pnp_lock);
+                mutex_unlock(&pnp_lock);
                 return -EBUSY;
         }
         pnp_dev->status = PNP_ATTACHED;
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         return 0;
 }
 
 void pnp_device_detach(struct pnp_dev *pnp_dev)
 {
-        spin_lock(&pnp_lock);
+        mutex_lock(&pnp_lock);
         if (pnp_dev->status == PNP_ATTACHED)
                 pnp_dev->status = PNP_READY;
-        spin_unlock(&pnp_lock);
+        mutex_unlock(&pnp_lock);
         pnp_disable_dev(pnp_dev);
 }