From a05801b2c9efb83c321f09cd3709ce1965133d15 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 18 Jun 2009 14:46:57 -0600 Subject: [PATCH] --- yaml --- r: 154156 b: refs/heads/master c: caf420c68afe01acd7c458ce40b85b3db5330ff5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_root.c | 21 ++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 7b2b17f9bec4..bf2c81b36a83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5eebbe119a861b5e4f5c67c886eab0937c686ed +refs/heads/master: caf420c68afe01acd7c458ce40b85b3db5330ff5 diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c index 0d69c0348c58..7984e00540fa 100644 --- a/trunk/drivers/acpi/pci_root.c +++ b/trunk/drivers/acpi/pci_root.c @@ -497,30 +497,17 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) static int acpi_pci_root_start(struct acpi_device *device) { - struct acpi_pci_root *root; - + struct acpi_pci_root *root = acpi_driver_data(device); - list_for_each_entry(root, &acpi_pci_roots, node) { - if (root->device == device) { - pci_bus_add_devices(root->bus); - return 0; - } - } - return -ENODEV; + pci_bus_add_devices(root->bus); + return 0; } static int acpi_pci_root_remove(struct acpi_device *device, int type) { - struct acpi_pci_root *root = NULL; - - - if (!device || !acpi_driver_data(device)) - return -EINVAL; - - root = acpi_driver_data(device); + struct acpi_pci_root *root = acpi_driver_data(device); kfree(root); - return 0; }