2 files changed, 7 insertions, 12 deletions

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 91c047a7e635..dd6384b1efce 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -311,7 +311,6 @@ done:
         return NULL;
 
 found:
-        down_write(&dev->dev.bus->subsys.rwsem);
         dev->card_link = clink;
         dev->dev.driver = &drv->link.driver;
         if (pnp_bus_type.probe(&dev->dev))
@@ -319,14 +318,11 @@ found:
         if (device_bind_driver(&dev->dev))
                 goto err_out;
 
-        up_write(&dev->dev.bus->subsys.rwsem);
-
         return dev;
 
 err_out:
         dev->dev.driver = NULL;
         dev->card_link = NULL;
-        up_write(&dev->dev.bus->subsys.rwsem);
         return NULL;
 }
 
@@ -340,11 +336,9 @@ void pnp_release_card_device(struct pnp_dev * dev)
         struct pnp_card_driver * drv = dev->card_link->driver;
         if (!drv)
                 return;
-        down_write(&dev->dev.bus->subsys.rwsem);
         drv->link.remove = &card_remove;
         device_release_driver(&dev->dev);
         drv->link.remove = &card_remove_first;
-        up_write(&dev->dev.bus->subsys.rwsem);
 }
 
 /*
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 2065e74bb63f..a8a95540b1ef 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -22,7 +22,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
         {       "",                     0       }
 };
 
-static void reserve_range(char *pnpid, int start, int end, int port)
+static void reserve_range(const char *pnpid, resource_size_t start, resource_size_t end, int port)
 {
         struct resource *res;
         char *regionid;
@@ -32,9 +32,9 @@ static void reserve_range(char *pnpid, int start, int end, int port)
                 return;
         snprintf(regionid, 16, "pnp %s", pnpid);
         if (port)
-                res = request_region(start,end-start+1,regionid);
+                res = request_region(start, end-start+1, regionid);
         else
-                res = request_mem_region(start,end-start+1,regionid);
+                res = request_mem_region(start, end-start+1, regionid);
         if (res == NULL)
                 kfree(regionid);
         else
@@ -45,12 +45,13 @@ static void reserve_range(char *pnpid, int start, int end, int port)
          * have double reservations.
          */
         printk(KERN_INFO
-                "pnp: %s: %s range 0x%x-0x%x %s reserved\n",
-                pnpid, port ? "ioport" : "iomem", start, end,
+                "pnp: %s: %s range 0x%llx-0x%llx %s reserved\n",
+                pnpid, port ? "ioport" : "iomem",
+                (unsigned long long)start, (unsigned long long)end,
                 NULL != res ? "has been" : "could not be");
 }
 
-static void reserve_resources_of_dev(struct pnp_dev *dev)
+static void reserve_resources_of_dev(const struct pnp_dev *dev)
 {
         int i;