PNP: make pnpacpi_suspend handle errors

[linux-2.6] / drivers / pnp / system.c

diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 2065e74bb63f530d6fae0b99279d24058d1493b1..a06f980b3ac9b596ef886b08a908602c79ec270f 100644 (file)
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -16,13 +16,14 @@
 
 static const struct pnp_device_id pnp_dev_table[] = {
        /* General ID for reserving resources */
-       {       "PNP0c02",              0       },
+       {"PNP0c02", 0},
        /* memory controller */
-       {       "PNP0c01",              0       },
-       {       "",                     0       }
+       {"PNP0c01", 0},
+       {"", 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 +33,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
@@ -44,13 +45,13 @@ static void reserve_range(char *pnpid, int start, int end, int port)
         * example do reserve stuff they know about too, so we may well
         * have double reservations.
         */
-       printk(KERN_INFO
-               "pnp: %s: %s range 0x%x-0x%x %s reserved\n",
-               pnpid, port ? "ioport" : "iomem", start, end,
-               NULL != res ? "has been" : "could not be");
+       printk(KERN_INFO "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;
 
@@ -73,7 +74,7 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
                        continue;       /* invalid */
 
                reserve_range(dev->dev.bus_id, pnp_port_start(dev, i),
-                       pnp_port_end(dev, i), 1);
+                             pnp_port_end(dev, i), 1);
        }
 
        for (i = 0; i < PNP_MAX_MEM; i++) {
@@ -81,24 +82,22 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
                        continue;
 
                reserve_range(dev->dev.bus_id, pnp_mem_start(dev, i),
-                       pnp_mem_end(dev, i), 0);
+                             pnp_mem_end(dev, i), 0);
        }
-
-       return;
 }
 
-static int system_pnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id)
+static int system_pnp_probe(struct pnp_dev *dev,
+                           const struct pnp_device_id *dev_id)
 {
        reserve_resources_of_dev(dev);
        return 0;
 }
 
 static struct pnp_driver system_pnp_driver = {
-       .name           = "system",
-       .id_table       = pnp_dev_table,
-       .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
-       .probe          = system_pnp_probe,
-       .remove         = NULL,
+       .name     = "system",
+       .id_table = pnp_dev_table,
+       .flags    = PNP_DRIVER_RES_DO_NOT_CHANGE,
+       .probe    = system_pnp_probe,
 };
 
 static int __init pnp_system_init(void)