diff options
author | Len Brown <len.brown@intel.com> | 2008-12-15 22:09:26 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-07 02:02:15 -0400 |
commit | 33b571501553ceb008c0aef8b89e932d4efda2a2 (patch) | |
tree | 6d02626d16cb0f0deb2f4f00d2be22bfcfa45f50 /drivers/acpi | |
parent | 9090589d87506c578ea1523ffd7ae7fd9424fb28 (diff) |
ACPI: delete acpi_device.g_list
unused
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/scan.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index e63f2febad84..8ff510b91d88 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -491,7 +491,6 @@ static int acpi_device_register(struct acpi_device *device, | |||
491 | */ | 491 | */ |
492 | INIT_LIST_HEAD(&device->children); | 492 | INIT_LIST_HEAD(&device->children); |
493 | INIT_LIST_HEAD(&device->node); | 493 | INIT_LIST_HEAD(&device->node); |
494 | INIT_LIST_HEAD(&device->g_list); | ||
495 | INIT_LIST_HEAD(&device->wakeup_list); | 494 | INIT_LIST_HEAD(&device->wakeup_list); |
496 | 495 | ||
497 | new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL); | 496 | 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, | |||
521 | } | 520 | } |
522 | dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no); | 521 | dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no); |
523 | 522 | ||
524 | if (device->parent) { | 523 | if (device->parent) |
525 | list_add_tail(&device->node, &device->parent->children); | 524 | list_add_tail(&device->node, &device->parent->children); |
526 | list_add_tail(&device->g_list, &device->parent->g_list); | 525 | |
527 | } else | ||
528 | list_add_tail(&device->g_list, &acpi_device_list); | ||
529 | if (device->wakeup.flags.valid) | 526 | if (device->wakeup.flags.valid) |
530 | list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list); | 527 | list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list); |
531 | mutex_unlock(&acpi_device_lock); | 528 | mutex_unlock(&acpi_device_lock); |
@@ -550,11 +547,8 @@ static int acpi_device_register(struct acpi_device *device, | |||
550 | return 0; | 547 | return 0; |
551 | end: | 548 | end: |
552 | mutex_lock(&acpi_device_lock); | 549 | mutex_lock(&acpi_device_lock); |
553 | if (device->parent) { | 550 | if (device->parent) |
554 | list_del(&device->node); | 551 | list_del(&device->node); |
555 | list_del(&device->g_list); | ||
556 | } else | ||
557 | list_del(&device->g_list); | ||
558 | list_del(&device->wakeup_list); | 552 | list_del(&device->wakeup_list); |
559 | mutex_unlock(&acpi_device_lock); | 553 | mutex_unlock(&acpi_device_lock); |
560 | return result; | 554 | return result; |
@@ -563,11 +557,8 @@ static int acpi_device_register(struct acpi_device *device, | |||
563 | static void acpi_device_unregister(struct acpi_device *device, int type) | 557 | static void acpi_device_unregister(struct acpi_device *device, int type) |
564 | { | 558 | { |
565 | mutex_lock(&acpi_device_lock); | 559 | mutex_lock(&acpi_device_lock); |
566 | if (device->parent) { | 560 | if (device->parent) |
567 | list_del(&device->node); | 561 | list_del(&device->node); |
568 | list_del(&device->g_list); | ||
569 | } else | ||
570 | list_del(&device->g_list); | ||
571 | 562 | ||
572 | list_del(&device->wakeup_list); | 563 | list_del(&device->wakeup_list); |
573 | mutex_unlock(&acpi_device_lock); | 564 | mutex_unlock(&acpi_device_lock); |