diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
| commit | 583e5136f69588ffbc4f0cc5c2c2592f455ef5f6 (patch) | |
| tree | d70ce617254d0e6f9102496dbe2471e39b57eafb /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | c5943c881bfc77b5380f936745bf5f92503d89f5 (diff) | |
| parent | 0aea531326d1a17ccef7d9a538429c5b32cf4f12 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/kernel/setup_64.c
arch/x86/pci/irq.c
arch/x86/pci/pci.h
include/linux/device.h
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 648596d469f6..9342c848db29 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -258,7 +258,12 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) bridge->pci_bus->number, slot->device); retval = acpiphp_register_hotplug_slot(slot); if (retval) { - warn("acpiphp_register_hotplug_slot failed(err code = 0x%x)\n", retval); + if (retval == -EBUSY) + warn("Slot %d already registered by another " + "hotplug driver\n", slot->sun); + else + warn("acpiphp_register_hotplug_slot failed " + "(err code = 0x%x)\n", retval); goto err_exit; } } @@ -1867,19 +1872,3 @@ u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot) return (sta == 0) ? 0 : 1; } - - -/* - * pci address (seg/bus/dev) - */ -u32 acpiphp_get_address(struct acpiphp_slot *slot) -{ - u32 address; - struct pci_bus *pci_bus = slot->bridge->pci_bus; - - address = (pci_domain_nr(pci_bus) << 16) | - (pci_bus->number << 8) | - slot->device; - - return address; -} |