diff options
author | Yijing Wang <wangyijing@huawei.com> | 2014-10-27 03:48:46 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 11:34:29 -0500 |
commit | 6cf00af0ae158120e8149ed3d77746397b3f911f (patch) | |
tree | 7b14a4ae637d058207731d559f0abe3790e4ed01 | |
parent | 8dd26dc8fecab05aa92cd7f109f691c1283c5a13 (diff) |
ARM/PCI: Remove unused pcibios_add_bus() and pcibios_remove_bus()
There are no users of the struct hw_pci.add_bus() or .remove_bus() methods,
so remove the pointers from hw_pci. That makes pcibios_add_bus() and
pcibios_remove_bus() themselves superfluous, so remove them as well.
[bhelgaas: changelog]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r-- | arch/arm/include/asm/mach/pci.h | 4 | ||||
-rw-r--r-- | arch/arm/kernel/bios32.c | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 8144d61e5693..8292b5f81e23 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h | |||
@@ -39,8 +39,6 @@ struct hw_pci { | |||
39 | resource_size_t start, | 39 | resource_size_t start, |
40 | resource_size_t size, | 40 | resource_size_t size, |
41 | resource_size_t align); | 41 | resource_size_t align); |
42 | void (*add_bus)(struct pci_bus *bus); | ||
43 | void (*remove_bus)(struct pci_bus *bus); | ||
44 | }; | 42 | }; |
45 | 43 | ||
46 | /* | 44 | /* |
@@ -71,8 +69,6 @@ struct pci_sys_data { | |||
71 | resource_size_t start, | 69 | resource_size_t start, |
72 | resource_size_t size, | 70 | resource_size_t size, |
73 | resource_size_t align); | 71 | resource_size_t align); |
74 | void (*add_bus)(struct pci_bus *bus); | ||
75 | void (*remove_bus)(struct pci_bus *bus); | ||
76 | void *private_data; /* platform controller private data */ | 72 | void *private_data; /* platform controller private data */ |
77 | }; | 73 | }; |
78 | 74 | ||
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index ff2be3a22e1d..daaff73bc776 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
@@ -369,20 +369,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) | |||
369 | } | 369 | } |
370 | EXPORT_SYMBOL(pcibios_fixup_bus); | 370 | EXPORT_SYMBOL(pcibios_fixup_bus); |
371 | 371 | ||
372 | void pcibios_add_bus(struct pci_bus *bus) | ||
373 | { | ||
374 | struct pci_sys_data *sys = bus->sysdata; | ||
375 | if (sys->add_bus) | ||
376 | sys->add_bus(bus); | ||
377 | } | ||
378 | |||
379 | void pcibios_remove_bus(struct pci_bus *bus) | ||
380 | { | ||
381 | struct pci_sys_data *sys = bus->sysdata; | ||
382 | if (sys->remove_bus) | ||
383 | sys->remove_bus(bus); | ||
384 | } | ||
385 | |||
386 | /* | 372 | /* |
387 | * Swizzle the device pin each time we cross a bridge. If a platform does | 373 | * Swizzle the device pin each time we cross a bridge. If a platform does |
388 | * not provide a swizzle function, we perform the standard PCI swizzling. | 374 | * not provide a swizzle function, we perform the standard PCI swizzling. |
@@ -487,8 +473,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, | |||
487 | sys->swizzle = hw->swizzle; | 473 | sys->swizzle = hw->swizzle; |
488 | sys->map_irq = hw->map_irq; | 474 | sys->map_irq = hw->map_irq; |
489 | sys->align_resource = hw->align_resource; | 475 | sys->align_resource = hw->align_resource; |
490 | sys->add_bus = hw->add_bus; | ||
491 | sys->remove_bus = hw->remove_bus; | ||
492 | INIT_LIST_HEAD(&sys->resources); | 476 | INIT_LIST_HEAD(&sys->resources); |
493 | 477 | ||
494 | if (hw->private_data) | 478 | if (hw->private_data) |