diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:19 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:19 +0300 |
| commit | 9198407e23ec89f0e1562f439771aeea83345d0d (patch) | |
| tree | c6a53b71b48c49d7713539eb035e7b2fcec69d2a /arch/arm64 | |
| parent | d872694bac212f76ca13fd20a85e5c1bdb53a945 (diff) | |
| parent | c775697b713b70293507573355aa8c8c177db35b (diff) | |
| download | linux-9198407e23ec89f0e1562f439771aeea83345d0d.tar.xz | |
Merge branch 'pci/resource' into next
* pci/resource:
microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
ARC: Remove empty kernel/pcibios.c
PCI: Add a generic weak pcibios_align_resource()
PCI: Add a generic weak pcibios_fixup_bus()
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/pci.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index e2b7e4f9cc31..0e2ea1c78542 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -22,23 +22,6 @@ #include <linux/pci-ecam.h> #include <linux/slab.h> -/* - * Called after each bus is probed, but before its children are examined - */ -void pcibios_fixup_bus(struct pci_bus *bus) -{ - /* nothing to do, expected to be removed in the future */ -} - -/* - * We don't have to worry about legacy ISA devices, so nothing to do here - */ -resource_size_t pcibios_align_resource(void *data, const struct resource *res, - resource_size_t size, resource_size_t align) -{ - return res->start; -} - #ifdef CONFIG_ACPI /* * Try to assign the IRQ number when probing a new device |