aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 22ca3a1f3896..0984a1ee24ed 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -58,7 +58,6 @@ static struct acpi_driver acpi_pci_root_driver = {
58 58
59struct acpi_pci_root { 59struct acpi_pci_root {
60 struct list_head node; 60 struct list_head node;
61 acpi_handle handle;
62 struct acpi_device * device; 61 struct acpi_device * device;
63 struct acpi_pci_id id; 62 struct acpi_pci_id id;
64 struct pci_bus *bus; 63 struct pci_bus *bus;
@@ -171,7 +170,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
171 memset(root, 0, sizeof(struct acpi_pci_root)); 170 memset(root, 0, sizeof(struct acpi_pci_root));
172 INIT_LIST_HEAD(&root->node); 171 INIT_LIST_HEAD(&root->node);
173 172
174 root->handle = device->handle;
175 root->device = device; 173 root->device = device;
176 strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); 174 strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME);
177 strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); 175 strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
@@ -317,7 +315,7 @@ static int acpi_pci_root_start(struct acpi_device *device)
317 315
318 316
319 list_for_each_entry(root, &acpi_pci_roots, node) { 317 list_for_each_entry(root, &acpi_pci_roots, node) {
320 if (root->handle == device->handle) { 318 if (root->device == device) {
321 pci_bus_add_devices(root->bus); 319 pci_bus_add_devices(root->bus);
322 return 0; 320 return 0;
323 } 321 }