diff options
Diffstat (limited to 'drivers/pci/ioapic.c')
-rw-r--r-- | drivers/pci/ioapic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 3e0d7b5dd1b9..203508b227b7 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
20 | #include <linux/acpi.h> | 20 | #include <linux/acpi.h> |
21 | #include <linux/slab.h> | ||
21 | #include <acpi/acpi_bus.h> | 22 | #include <acpi/acpi_bus.h> |
22 | 23 | ||
23 | struct ioapic { | 24 | struct ioapic { |
@@ -31,9 +32,9 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent) | |||
31 | acpi_status status; | 32 | acpi_status status; |
32 | unsigned long long gsb; | 33 | unsigned long long gsb; |
33 | struct ioapic *ioapic; | 34 | struct ioapic *ioapic; |
34 | u64 addr; | ||
35 | int ret; | 35 | int ret; |
36 | char *type; | 36 | char *type; |
37 | struct resource *res; | ||
37 | 38 | ||
38 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | 39 | handle = DEVICE_ACPI_HANDLE(&dev->dev); |
39 | if (!handle) | 40 | if (!handle) |
@@ -69,13 +70,12 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent) | |||
69 | if (pci_request_region(dev, 0, type)) | 70 | if (pci_request_region(dev, 0, type)) |
70 | goto exit_disable; | 71 | goto exit_disable; |
71 | 72 | ||
72 | addr = pci_resource_start(dev, 0); | 73 | res = &dev->resource[0]; |
73 | if (acpi_register_ioapic(ioapic->handle, addr, ioapic->gsi_base)) | 74 | if (acpi_register_ioapic(ioapic->handle, res->start, ioapic->gsi_base)) |
74 | goto exit_release; | 75 | goto exit_release; |
75 | 76 | ||
76 | pci_set_drvdata(dev, ioapic); | 77 | pci_set_drvdata(dev, ioapic); |
77 | dev_info(&dev->dev, "%s at %#llx, GSI %u\n", type, addr, | 78 | dev_info(&dev->dev, "%s at %pR, GSI %u\n", type, res, ioapic->gsi_base); |
78 | ioapic->gsi_base); | ||
79 | return 0; | 79 | return 0; |
80 | 80 | ||
81 | exit_release: | 81 | exit_release: |