]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ACPI: delete acpi_device.g_list
authorLen Brown <len.brown@intel.com>
Tue, 16 Dec 2008 03:09:26 +0000 (22:09 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 7 Apr 2009 06:02:15 +0000 (02:02 -0400)
unused

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/scan.c
include/acpi/acpi_bus.h

index e63f2febad84956d5b36fa6ff3496ad9062f8352..8ff510b91d88f4f38e473afab76425a9cf392477 100644 (file)
@@ -491,7 +491,6 @@ static int acpi_device_register(struct acpi_device *device,
         */
        INIT_LIST_HEAD(&device->children);
        INIT_LIST_HEAD(&device->node);
-       INIT_LIST_HEAD(&device->g_list);
        INIT_LIST_HEAD(&device->wakeup_list);
 
        new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
@@ -521,11 +520,9 @@ static int acpi_device_register(struct acpi_device *device,
        }
        dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
 
-       if (device->parent) {
+       if (device->parent)
                list_add_tail(&device->node, &device->parent->children);
-               list_add_tail(&device->g_list, &device->parent->g_list);
-       } else
-               list_add_tail(&device->g_list, &acpi_device_list);
+
        if (device->wakeup.flags.valid)
                list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
        mutex_unlock(&acpi_device_lock);
@@ -550,11 +547,8 @@ static int acpi_device_register(struct acpi_device *device,
        return 0;
   end:
        mutex_lock(&acpi_device_lock);
-       if (device->parent) {
+       if (device->parent)
                list_del(&device->node);
-               list_del(&device->g_list);
-       } else
-               list_del(&device->g_list);
        list_del(&device->wakeup_list);
        mutex_unlock(&acpi_device_lock);
        return result;
@@ -563,11 +557,8 @@ static int acpi_device_register(struct acpi_device *device,
 static void acpi_device_unregister(struct acpi_device *device, int type)
 {
        mutex_lock(&acpi_device_lock);
-       if (device->parent) {
+       if (device->parent)
                list_del(&device->node);
-               list_del(&device->g_list);
-       } else
-               list_del(&device->g_list);
 
        list_del(&device->wakeup_list);
        mutex_unlock(&acpi_device_lock);
index a2228511d4be9433ca290bae158583148507f04f..c34b11022908a01c521367ddf85249fcacb98ffe 100644 (file)
@@ -270,7 +270,6 @@ struct acpi_device {
        struct list_head children;
        struct list_head node;
        struct list_head wakeup_list;
-       struct list_head g_list;
        struct acpi_device_status status;
        struct acpi_device_flags flags;
        struct acpi_device_pnp pnp;