aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_root.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 2d63a385b27b..22ca3a1f3896 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -84,7 +84,7 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver)
84 list_for_each(entry, &acpi_pci_roots) { 84 list_for_each(entry, &acpi_pci_roots) {
85 struct acpi_pci_root *root; 85 struct acpi_pci_root *root;
86 root = list_entry(entry, struct acpi_pci_root, node); 86 root = list_entry(entry, struct acpi_pci_root, node);
87 driver->add(root->handle); 87 driver->add(root->device->handle);
88 n++; 88 n++;
89 } 89 }
90 90
@@ -111,7 +111,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
111 list_for_each(entry, &acpi_pci_roots) { 111 list_for_each(entry, &acpi_pci_roots) {
112 struct acpi_pci_root *root; 112 struct acpi_pci_root *root;
113 root = list_entry(entry, struct acpi_pci_root, node); 113 root = list_entry(entry, struct acpi_pci_root, node);
114 driver->remove(root->handle); 114 driver->remove(root->device->handle);
115 } 115 }
116} 116}
117 117
@@ -187,7 +187,7 @@ static int acpi_pci_root_add(struct acpi_device *device)
187 * ------- 187 * -------
188 * Obtained via _SEG, if exists, otherwise assumed to be zero (0). 188 * Obtained via _SEG, if exists, otherwise assumed to be zero (0).
189 */ 189 */
190 status = acpi_evaluate_integer(root->handle, METHOD_NAME__SEG, NULL, 190 status = acpi_evaluate_integer(device->handle, METHOD_NAME__SEG, NULL,
191 &value); 191 &value);
192 switch (status) { 192 switch (status) {
193 case AE_OK: 193 case AE_OK:
@@ -209,7 +209,7 @@ static int acpi_pci_root_add(struct acpi_device *device)
209 * --- 209 * ---
210 * Obtained via _BBN, if exists, otherwise assumed to be zero (0). 210 * Obtained via _BBN, if exists, otherwise assumed to be zero (0).
211 */ 211 */
212 status = acpi_evaluate_integer(root->handle, METHOD_NAME__BBN, NULL, 212 status = acpi_evaluate_integer(device->handle, METHOD_NAME__BBN, NULL,
213 &value); 213 &value);
214 switch (status) { 214 switch (status) {
215 case AE_OK: 215 case AE_OK:
@@ -236,7 +236,7 @@ static int acpi_pci_root_add(struct acpi_device *device)
236 "Wrong _BBN value, reboot" 236 "Wrong _BBN value, reboot"
237 " and use option 'pci=noacpi'\n"); 237 " and use option 'pci=noacpi'\n");
238 238
239 status = try_get_root_bridge_busnr(root->handle, &bus); 239 status = try_get_root_bridge_busnr(device->handle, &bus);
240 if (ACPI_FAILURE(status)) 240 if (ACPI_FAILURE(status))
241 break; 241 break;
242 if (bus != root->id.bus) { 242 if (bus != root->id.bus) {
@@ -296,9 +296,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
296 * ----------------- 296 * -----------------
297 * Evaluate and parse _PRT, if exists. 297 * Evaluate and parse _PRT, if exists.
298 */ 298 */
299 status = acpi_get_handle(root->handle, METHOD_NAME__PRT, &handle); 299 status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
300 if (ACPI_SUCCESS(status)) 300 if (ACPI_SUCCESS(status))
301 result = acpi_pci_irq_add_prt(root->handle, root->id.segment, 301 result = acpi_pci_irq_add_prt(device->handle, root->id.segment,
302 root->id.bus); 302 root->id.bus);
303 303
304 end: 304 end: