6 files changed, 111 insertions, 46 deletions

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 0bab84ebb15d..19bc73695475 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -12,11 +12,12 @@ void pnp_unregister_protocol(struct pnp_protocol *protocol);
 
 #define PNP_EISA_ID_MASK 0x7fffffff
 void pnp_eisa_id_to_string(u32 id, char *str);
-struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
+struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id,
+                              const char *pnpid);
 struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
 
 int pnp_add_device(struct pnp_dev *dev);
-struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
+struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id);
 
 int pnp_add_card(struct pnp_card *card);
 void pnp_remove_card(struct pnp_card *card);
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 9801918b2726..cb6ce42f8e77 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -124,7 +124,8 @@ static void pnp_release_device(struct device *dmdev)
         kfree(dev);
 }
 
-struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)
+struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
+                              const char *pnpid)
 {
         struct pnp_dev *dev;
         struct pnp_id *dev_id;
@@ -194,8 +195,9 @@ int pnp_add_device(struct pnp_dev *dev)
         for (id = dev->id; id; id = id->next)
                 len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
 
-        pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
-                dev->protocol->name, buf, dev->active ? "active" : "disabled");
+        dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
+                   dev->protocol->name, buf,
+                   dev->active ? "active" : "disabled");
         return 0;
 }
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index cd11b113494f..00e94032531a 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -189,8 +189,11 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
-        if (pnp_dev->protocol->resume)
-                pnp_dev->protocol->resume(pnp_dev);
+        if (pnp_dev->protocol->resume) {
+                error = pnp_dev->protocol->resume(pnp_dev);
+                if (error)
+                        return error;
+        }
 
         if (pnp_can_write(pnp_dev)) {
                 error = pnp_start_dev(pnp_dev);
@@ -236,7 +239,7 @@ void pnp_unregister_driver(struct pnp_driver *drv)
  * @dev: pointer to the desired device
  * @id: pointer to an EISA id string
  */
-struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id)
+struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id)
 {
         struct pnp_id *dev_id, *ptr;
 
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index e73ebefdf3e0..315b3112aca8 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -21,7 +21,6 @@
 #include <linux/isapnp.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 extern struct pnp_protocol isapnp_protocol;
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index dc4e32e031e9..ca84d5099ce7 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -28,7 +28,7 @@
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver that
  * can't use pnp layer. We don't need to blacklist device that are directly
@@ -59,7 +59,7 @@ static inline int __init is_exclusive_device(struct acpi_device *dev)
 #define TEST_ALPHA(c) \
         if (!('@' <= (c) || (c) <= 'Z')) \
                 return 0
-static int __init ispnpidacpi(char *id)
+static int __init ispnpidacpi(const char *id)
 {
         TEST_ALPHA(id[0]);
         TEST_ALPHA(id[1]);
@@ -81,12 +81,19 @@ static int pnpacpi_get_resources(struct pnp_dev *dev)
 
 static int pnpacpi_set_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         struct acpi_buffer buffer;
         int ret;
 
         pnp_dbg(&dev->dev, "set resources\n");
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
+
         ret = pnpacpi_build_resource_template(dev, &buffer);
         if (ret)
                 return ret;
@@ -105,12 +112,18 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
 
 static int pnpacpi_disable_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         int ret;
 
         dev_dbg(&dev->dev, "disable resources\n");
 
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
+
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
         ret = 0;
         if (acpi_bus_power_manageable(handle))
@@ -124,46 +137,74 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
 #ifdef CONFIG_ACPI_SLEEP
 static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return false;
+        }
 
         return acpi_bus_can_wakeup(handle);
 }
 
 static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
-        int power_state;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+        int error = 0;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
 
         if (device_can_wakeup(&dev->dev)) {
-                int rc = acpi_pm_device_sleep_wake(&dev->dev,
+                error = acpi_pm_device_sleep_wake(&dev->dev,
                                 device_may_wakeup(&dev->dev));
+                if (error)
+                        return error;
+        }
+
+        if (acpi_bus_power_manageable(handle)) {
+                int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
 
-                if (rc)
-                        return rc;
+                if (power_state < 0)
+                        power_state = (state.event == PM_EVENT_ON) ?
+                                        ACPI_STATE_D0 : ACPI_STATE_D3;
+
+                /*
+                 * acpi_bus_set_power() often fails (keyboard port can't be
+                 * powered-down?), and in any case, our return value is ignored
+                 * by pnp_bus_suspend().  Hence we don't revert the wakeup
+                 * setting if the set_power fails.
+                 */
+                error = acpi_bus_set_power(handle, power_state);
         }
-        power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
-        if (power_state < 0)
-                power_state = (state.event == PM_EVENT_ON) ?
-                                ACPI_STATE_D0 : ACPI_STATE_D3;
-
-        /* acpi_bus_set_power() often fails (keyboard port can't be
-         * powered-down?), and in any case, our return value is ignored
-         * by pnp_bus_suspend().  Hence we don't revert the wakeup
-         * setting if the set_power fails.
-         */
-        return acpi_bus_set_power(handle, power_state);
+
+        return error;
 }
 
 static int pnpacpi_resume(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        int error = 0;
+
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
 
         if (device_may_wakeup(&dev->dev))
                 acpi_pm_device_sleep_wake(&dev->dev, false);
-        return acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        if (acpi_bus_power_manageable(handle))
+                error = acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        return error;
 }
 #endif
 
@@ -180,11 +221,24 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *__init pnpacpi_get_id(struct acpi_device *device)
+{
+        struct acpi_hardware_id *id;
+
+        list_for_each_entry(id, &device->pnp.ids, list) {
+                if (ispnpidacpi(id->id))
+                        return id->id;
+        }
+
+        return NULL;
+}
+
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
         acpi_handle temp = NULL;
         acpi_status status;
         struct pnp_dev *dev;
+        char *pnpid;
         struct acpi_hardware_id *id;
 
         /*
@@ -192,11 +246,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
          * driver should not be loaded.
          */
         status = acpi_get_handle(device->handle, "_CRS", &temp);
-        if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-            is_exclusive_device(device) || (!device->status.present))
+        if (ACPI_FAILURE(status))
+                return 0;
+
+        pnpid = pnpacpi_get_id(device);
+        if (!pnpid)
+                return 0;
+
+        if (is_exclusive_device(device) || !device->status.present)
                 return 0;
 
-        dev = pnp_alloc_dev(&pnpacpi_protocol, num, acpi_device_hid(device));
+        dev = pnp_alloc_dev(&pnpacpi_protocol, num, pnpid);
         if (!dev)
                 return -ENOMEM;
 
@@ -227,7 +287,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 pnpacpi_parse_resource_option_data(dev);
 
         list_for_each_entry(id, &device->pnp.ids, list) {
-                if (!strcmp(id->id, acpi_device_hid(device)))
+                if (!strcmp(id->id, pnpid))
                         continue;
                 if (!ispnpidacpi(id->id))
                         continue;
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index e3446ab8b563..a925e6b63d72 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
         res->start = irq;
         res->end = irq;
 
-        pnp_dbg(&dev->dev, "  add %pr\n", res);
+        dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
         return pnp_res;
 }
 
@@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
         res->start = dma;
         res->end = dma;
 
-        pnp_dbg(&dev->dev, "  add %pr\n", res);
+        dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
         return pnp_res;
 }
 
@@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
         res->start = start;
         res->end = end;
 
-        pnp_dbg(&dev->dev, "  add %pr\n", res);
+        dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
         return pnp_res;
 }
 
@@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
         res->start = start;
         res->end = end;
 
-        pnp_dbg(&dev->dev, "  add %pr\n", res);
+        dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
         return pnp_res;
 }
 
@@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev,
         res->start = start;
         res->end = end;
 
-        pnp_dbg(&dev->dev, "  add %pr\n", res);
+        dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
         return pnp_res;
 }