summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_bind.c
diff options
context:
space:
mode:
authorAlexander Chiang <achiang@hp.com>2009-06-10 21:55:35 +0200
committerLen Brown <len.brown@intel.com>2009-06-18 05:22:16 +0200
commit859a3f86ca83346f4097e956d0b27d96aa7a1cff (patch)
treeba56cc791a0c427ab817a86e57a6338c23bbb3c1 /drivers/acpi/pci_bind.c
parentACPI: eviscerate pci_bind.c (diff)
downloadlinux-859a3f86ca83346f4097e956d0b27d96aa7a1cff.tar.xz
linux-859a3f86ca83346f4097e956d0b27d96aa7a1cff.zip
ACPI: simplify acpi_pci_irq_add_prt() API
A PCI domain cannot change as you descend down subordinate buses, which makes the 'segment' argument to acpi_pci_irq_add_prt() useless. Change the interface to take a struct pci_bus *, from whence we can derive the bus number and segment. Reducing the number of arguments makes life simpler for callers. Signed-off-by: Alex Chiang <achiang@hp.com> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_bind.c')
-rw-r--r--drivers/acpi/pci_bind.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 703d2a3e8012..6eb58ef366ef 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -124,7 +124,7 @@ static int acpi_pci_bind(struct acpi_device *device)
{
acpi_status status;
acpi_handle handle;
- unsigned char bus;
+ struct pci_bus *bus;
struct pci_dev *dev;
dev = acpi_get_pci_dev(device->handle);
@@ -157,11 +157,11 @@ static int acpi_pci_bind(struct acpi_device *device)
goto out;
if (dev->subordinate)
- bus = dev->subordinate->number;
+ bus = dev->subordinate;
else
- bus = dev->bus->number;
+ bus = dev->bus;
- acpi_pci_irq_add_prt(device->handle, pci_domain_nr(dev->bus), bus);
+ acpi_pci_irq_add_prt(device->handle, bus);
out:
pci_dev_put(dev);