ACPI: fix OSC regression that caused aer and pciehp not to load

[safe/jmp/linux-2.6] / drivers / acpi / scan.c

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7e031b9..14a7481 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1016,22 +1016,19 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id)
 
 static void acpi_device_set_id(struct acpi_device *device)
 {
-       struct acpi_device_info *info = NULL;
-       char *hid = NULL;
-       char *uid = NULL;
-       struct acpica_device_id_list *cid_list = NULL;
-       char *cid_add = NULL;
        acpi_status status;
+       struct acpi_device_info *info;
+       struct acpica_device_id_list *cid_list;
        int i;
 
        switch (device->device_type) {
        case ACPI_BUS_TYPE_DEVICE:
                if (ACPI_IS_ROOT_DEVICE(device)) {
-                       hid = ACPI_SYSTEM_HID;
+                       acpi_add_id(device, ACPI_SYSTEM_HID);
                        break;
                } else if (ACPI_IS_ROOT_DEVICE(device->parent)) {
                        /* \_SB_, the only root-level namespace device */
-                       hid = ACPI_BUS_HID;
+                       acpi_add_id(device, ACPI_BUS_HID);
                        strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
                        strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
                        break;
@@ -1044,43 +1041,45 @@ static void acpi_device_set_id(struct acpi_device *device)
                }
 
                if (info->valid & ACPI_VALID_HID)
-                       hid = info->hardware_id.string;
-               if (info->valid & ACPI_VALID_UID)
-                       uid = info->unique_id.string;
-               if (info->valid & ACPI_VALID_CID)
+                       acpi_add_id(device, info->hardware_id.string);
+               if (info->valid & ACPI_VALID_CID) {
                        cid_list = &info->compatible_id_list;
+                       for (i = 0; i < cid_list->count; i++)
+                               acpi_add_id(device, cid_list->ids[i].string);
+               }
                if (info->valid & ACPI_VALID_ADR) {
                        device->pnp.bus_address = info->address;
                        device->flags.bus_address = 1;
                }
 
-               /* If we have a video/bay/dock device, add our selfdefined
-                  HID to the CID list. Like that the video/bay/dock drivers
-                  will get autoloaded and the device might still match
-                  against another driver.
-               */
+               kfree(info);
+
+               /*
+                * Some devices don't reliably have _HIDs & _CIDs, so add
+                * synthetic HIDs to make sure drivers can find them.
+                */
                if (acpi_is_video_device(device))
-                       cid_add = ACPI_VIDEO_HID;
+                       acpi_add_id(device, ACPI_VIDEO_HID);
                else if (ACPI_SUCCESS(acpi_bay_match(device)))
-                       cid_add = ACPI_BAY_HID;
+                       acpi_add_id(device, ACPI_BAY_HID);
                else if (ACPI_SUCCESS(acpi_dock_match(device)))
-                       cid_add = ACPI_DOCK_HID;
+                       acpi_add_id(device, ACPI_DOCK_HID);
 
                break;
        case ACPI_BUS_TYPE_POWER:
-               hid = ACPI_POWER_HID;
+               acpi_add_id(device, ACPI_POWER_HID);
                break;
        case ACPI_BUS_TYPE_PROCESSOR:
-               hid = ACPI_PROCESSOR_OBJECT_HID;
+               acpi_add_id(device, ACPI_PROCESSOR_OBJECT_HID);
                break;
        case ACPI_BUS_TYPE_THERMAL:
-               hid = ACPI_THERMAL_HID;
+               acpi_add_id(device, ACPI_THERMAL_HID);
                break;
        case ACPI_BUS_TYPE_POWER_BUTTON:
-               hid = ACPI_BUTTON_HID_POWERF;
+               acpi_add_id(device, ACPI_BUTTON_HID_POWERF);
                break;
        case ACPI_BUS_TYPE_SLEEP_BUTTON:
-               hid = ACPI_BUTTON_HID_SLEEPF;
+               acpi_add_id(device, ACPI_BUTTON_HID_SLEEPF);
                break;
        }
 
@@ -1091,28 +1090,8 @@ static void acpi_device_set_id(struct acpi_device *device)
         * This generic ID isn't useful for driver binding, but it provides
         * the useful property that "every acpi_device has an ID."
         */
-       if (!hid && !cid_list && !cid_add)
-               hid = "device";
-
-       if (hid)
-               acpi_add_id(device, hid);
-       if (uid) {
-               device->pnp.unique_id = ACPI_ALLOCATE_ZEROED(strlen (uid) + 1);
-               if (device->pnp.unique_id) {
-                       strcpy(device->pnp.unique_id, uid);
-                       device->flags.unique_id = 1;
-               }
-       }
-       if (!device->flags.unique_id)
-               device->pnp.unique_id = "";
-
-       if (cid_list)
-               for (i = 0; i < cid_list->count; i++)
-                       acpi_add_id(device, cid_list->ids[i].string);
-       if (cid_add)
-               acpi_add_id(device, cid_add);
-
-       kfree(info);
+       if (list_empty(&device->pnp.ids))
+               acpi_add_id(device, "device");
 }
 
 static int acpi_device_set_context(struct acpi_device *device)
@@ -1200,11 +1179,6 @@ static int acpi_add_single_object(struct acpi_device **child,
         * -----------------
         * TBD: Synch with Core's enumeration/initialization process.
         */
-
-       /*
-        * Hardware ID, Unique ID, & Bus Address
-        * -------------------------------------
-        */
        acpi_device_set_id(device);
 
        /*
@@ -1353,13 +1327,8 @@ static int acpi_bus_scan(acpi_handle handle, struct acpi_bus_ops *ops,
                         struct acpi_device **child)
 {
        acpi_status status;
-       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        void *device = NULL;
 
-       acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-       printk(KERN_INFO PREFIX "Enumerating devices from [%s]\n",
-              (char *) buffer.pointer);
-
        status = acpi_bus_check_add(handle, 0, ops, &device);
        if (ACPI_SUCCESS(status))
                acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,