1 files changed, 48 insertions, 72 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f6f52c1a2aba..39b7233c3485 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -109,20 +109,19 @@ static int acpi_bus_hot_remove_device(void *context)
                 return 0;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                "Hot-removing device %s...\n", device->dev.bus_id));
-
+                "Hot-removing device %s...\n", dev_name(&device->dev)));
 
         if (acpi_bus_trim(device, 1)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                "Removing device failed\n"));
+                printk(KERN_ERR PREFIX
+                                "Removing device failed\n");
                 return -1;
         }
 
         /* power off device */
         status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                "Power-off device failed\n"));
+                printk(KERN_WARNING PREFIX
+                                "Power-off device failed\n");
 
         if (device->flags.lockable) {
                 arg_list.count = 1;
@@ -276,6 +275,13 @@ int acpi_match_device_ids(struct acpi_device *device,
 {
         const struct acpi_device_id *id;
 
+        /*
+         * If the device is not present, it is unnecessary to load device
+         * driver for it.
+         */
+        if (!device->status.present)
+                return -ENODEV;
+
         if (device->flags.hardware_id) {
                 for (id = ids; id->id[0]; id++) {
                         if (!strcmp((char*)id->id, device->pnp.hardware_id))
@@ -384,7 +390,7 @@ static int acpi_device_remove(struct device * dev)
                         acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type);
         }
         acpi_dev->driver = NULL;
-        acpi_driver_data(dev) = NULL;
+        acpi_dev->driver_data = NULL;
 
         put_device(dev);
         return 0;
@@ -453,7 +459,7 @@ static int acpi_device_register(struct acpi_device *device,
                 acpi_device_bus_id->instance_no = 0;
                 list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
         }
-        sprintf(device->dev.bus_id, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
+        dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
 
         if (device->parent) {
                 list_add_tail(&device->node, &device->parent->children);
@@ -477,7 +483,8 @@ static int acpi_device_register(struct acpi_device *device,
 
         result = acpi_device_setup_files(device);
         if(result)
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error creating sysfs interface for device %s\n", device->dev.bus_id));
+                printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",
+                       dev_name(&device->dev));
 
         device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
         return 0;
@@ -537,7 +544,7 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
         result = driver->ops.add(device);
         if (result) {
                 device->driver = NULL;
-                acpi_driver_data(device) = NULL;
+                device->driver_data = NULL;
                 return result;
         }
 
@@ -807,6 +814,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         /* TBD: System wake support and resource requirements. */
 
         device->power.state = ACPI_STATE_UNKNOWN;
+        acpi_bus_get_power(device->handle, &(device->power.state));
 
         return 0;
 }
@@ -901,36 +909,6 @@ static void acpi_device_get_busid(struct acpi_device *device,
         }
 }
 
-static int
-acpi_video_bus_match(struct acpi_device *device)
-{
-        acpi_handle h_dummy;
-
-        if (!device)
-                return -EINVAL;
-
-        /* Since there is no HID, CID for ACPI Video drivers, we have
-         * to check well known required nodes for each feature we support.
-         */
-
-        /* Does this device able to support video switching ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
-                return 0;
-
-        /* Does this device able to retrieve a video ROM ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
-                return 0;
-
-        /* Does this device able to configure which video head to be POSTed ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
-                return 0;
-
-        return -ENODEV;
-}
-
 /*
  * acpi_bay_match - see if a device is an ejectable driver bay
  *
@@ -1013,7 +991,7 @@ static void acpi_device_set_id(struct acpi_device *device,
                    will get autoloaded and the device might still match
                    against another driver.
                 */
-                if (ACPI_SUCCESS(acpi_video_bus_match(device)))
+                if (acpi_is_video_device(device))
                         cid_add = ACPI_VIDEO_HID;
                 else if (ACPI_SUCCESS(acpi_bay_match(device)))
                         cid_add = ACPI_BAY_HID;
@@ -1025,7 +1003,7 @@ static void acpi_device_set_id(struct acpi_device *device,
                 hid = ACPI_POWER_HID;
                 break;
         case ACPI_BUS_TYPE_PROCESSOR:
-                hid = ACPI_PROCESSOR_HID;
+                hid = ACPI_PROCESSOR_OBJECT_HID;
                 break;
         case ACPI_BUS_TYPE_SYSTEM:
                 hid = ACPI_SYSTEM_HID;
@@ -1153,20 +1131,6 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
 }
 
 static int
-acpi_is_child_device(struct acpi_device *device,
-                        int (*matcher)(struct acpi_device *))
-{
-        int result = -ENODEV;
-
-        do {
-                if (ACPI_SUCCESS(matcher(device)))
-                        return AE_OK;
-        } while ((device = device->parent));
-
-        return result;
-}
-
-static int
 acpi_add_single_object(struct acpi_device **child,
                        struct acpi_device *parent, acpi_handle handle, int type,
                         struct acpi_bus_ops *ops)
@@ -1221,15 +1185,18 @@ acpi_add_single_object(struct acpi_device **child,
                         result = -ENODEV;
                         goto end;
                 }
-                if (!device->status.present) {
-                        /* Bay and dock should be handled even if absent */
-                        if (!ACPI_SUCCESS(
-                             acpi_is_child_device(device, acpi_bay_match)) &&
-                            !ACPI_SUCCESS(
-                             acpi_is_child_device(device, acpi_dock_match))) {
-                                        result = -ENODEV;
-                                        goto end;
-                        }
+                /*
+                 * When the device is neither present nor functional, the
+                 * device should not be added to Linux ACPI device tree.
+                 * When the status of the device is not present but functinal,
+                 * it should be added to Linux ACPI tree. For example : bay
+                 * device , dock device.
+                 * In such conditions it is unncessary to check whether it is
+                 * bay device or dock device.
+                 */
+                if (!device->status.present && !device->status.functional) {
+                        result = -ENODEV;
+                        goto end;
                 }
                 break;
         default:
@@ -1252,6 +1219,16 @@ acpi_add_single_object(struct acpi_device **child,
         acpi_device_set_id(device, parent, handle, type);
 
         /*
+         * The ACPI device is attached to acpi handle before getting
+         * the power/wakeup/peformance flags. Otherwise OS can't get
+         * the corresponding ACPI device by the acpi handle in the course
+         * of getting the power/wakeup/performance flags.
+         */
+        result = acpi_device_set_context(device, type);
+        if (result)
+                goto end;
+
+        /*
          * Power Management
          * ----------------
          */
@@ -1281,8 +1258,6 @@ acpi_add_single_object(struct acpi_device **child,
                         goto end;
         }
 
-        if ((result = acpi_device_set_context(device, type)))
-                goto end;
 
         result = acpi_device_register(device, parent);
 
@@ -1402,7 +1377,12 @@ static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)
                  * TBD: Need notifications and other detection mechanisms
                  *      in place before we can fully implement this.
                  */
-                if (child->status.present) {
+                 /*
+                 * When the device is not present but functional, it is also
+                 * necessary to scan the children of this device.
+                 */
+                if (child->status.present || (!child->status.present &&
+                                        child->status.functional)) {
                         status = acpi_get_next_object(ACPI_TYPE_ANY, chandle,
                                                       NULL, NULL);
                         if (ACPI_SUCCESS(status)) {
@@ -1545,7 +1525,6 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
         return result;
 }
 
-int __init acpi_boot_ec_enable(void);
 
 static int __init acpi_scan_init(void)
 {
@@ -1579,9 +1558,6 @@ static int __init acpi_scan_init(void)
          */
         result = acpi_bus_scan_fixed(acpi_root);
 
-        /* EC region might be needed at bus_scan, so enable it now */
-        acpi_boot_ec_enable();
-
         if (!result)
                 result = acpi_bus_scan(acpi_root, &ops);