Commit bccf90d6 authored by Palmer Dabbelt's avatar Palmer Dabbelt Committed by Bjorn Helgaas

PCI: Add a generic weak pcibios_fixup_bus()

Multiple architectures define this as an empty function, and I'm adding
another one as part of the RISC-V port.  Add a __weak version of
pcibios_fixup_bus() and delete the now-obselete ones in a handful of
ports.

The only functional change should be that microblaze used to export
pcibios_fixup_bus().  None of the other architectures exports this, so I
just dropped it.
Signed-off-by: default avatarPalmer Dabbelt <palmer@dabbelt.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 16f73eb0
...@@ -16,7 +16,3 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, ...@@ -16,7 +16,3 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
{ {
return res->start; return res->start;
} }
void pcibios_fixup_bus(struct pci_bus *bus)
{
}
...@@ -22,14 +22,6 @@ ...@@ -22,14 +22,6 @@
#include <linux/pci-ecam.h> #include <linux/pci-ecam.h>
#include <linux/slab.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 * We don't have to worry about legacy ISA devices, so nothing to do here
*/ */
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <hwregs/intr_vect.h> #include <hwregs/intr_vect.h>
void pcibios_fixup_bus(struct pci_bus *b)
{
}
void pcibios_set_master(struct pci_dev *dev) void pcibios_set_master(struct pci_dev *dev)
{ {
u8 lat; u8 lat;
......
...@@ -810,12 +810,6 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) ...@@ -810,12 +810,6 @@ void pcibios_setup_bus_devices(struct pci_bus *bus)
} }
} }
void pcibios_fixup_bus(struct pci_bus *bus)
{
/* nothing to do */
}
EXPORT_SYMBOL(pcibios_fixup_bus);
/* /*
* We need to avoid collisions with `mirrored' VGA ports * We need to avoid collisions with `mirrored' VGA ports
* and other strange ISA hardware, so we always want the * and other strange ISA hardware, so we always want the
......
...@@ -262,10 +262,6 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len) ...@@ -262,10 +262,6 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)
return rc; return rc;
} }
void pcibios_fixup_bus(struct pci_bus *bus)
{
}
resource_size_t pcibios_align_resource(void *data, const struct resource *res, resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t size,
resource_size_t align) resource_size_t align)
......
...@@ -154,14 +154,6 @@ static int __init pcibios_init(void) ...@@ -154,14 +154,6 @@ static int __init pcibios_init(void)
} }
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
/*
* Called after each bus is probed, but before its children
* are examined.
*/
void pcibios_fixup_bus(struct pci_bus *bus)
{
}
/* /*
* We need to avoid collisions with `mirrored' VGA ports * We need to avoid collisions with `mirrored' VGA ports
* and other strange ISA hardware, so we always want the * and other strange ISA hardware, so we always want the
......
...@@ -690,10 +690,6 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, ...@@ -690,10 +690,6 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
return bus; return bus;
} }
void pcibios_fixup_bus(struct pci_bus *pbus)
{
}
resource_size_t pcibios_align_resource(void *data, const struct resource *res, resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align) resource_size_t size, resource_size_t align)
{ {
......
...@@ -369,14 +369,6 @@ int __init pcibios_init(void) ...@@ -369,14 +369,6 @@ int __init pcibios_init(void)
} }
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
/*
* No bus fixups needed.
*/
void pcibios_fixup_bus(struct pci_bus *bus)
{
/* Nothing needs to be done. */
}
void pcibios_set_master(struct pci_dev *dev) void pcibios_set_master(struct pci_dev *dev)
{ {
/* No special bus mastering setup handling. */ /* No special bus mastering setup handling. */
......
...@@ -1038,11 +1038,6 @@ int __init pcibios_init(void) ...@@ -1038,11 +1038,6 @@ int __init pcibios_init(void)
} }
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
/* No bus fixups needed. */
void pcibios_fixup_bus(struct pci_bus *bus)
{
}
/* Process any "pci=" kernel boot arguments. */ /* Process any "pci=" kernel boot arguments. */
char *__init pcibios_setup(char *str) char *__init pcibios_setup(char *str)
{ {
......
...@@ -2288,6 +2288,15 @@ void pcie_bus_configure_settings(struct pci_bus *bus) ...@@ -2288,6 +2288,15 @@ void pcie_bus_configure_settings(struct pci_bus *bus)
} }
EXPORT_SYMBOL_GPL(pcie_bus_configure_settings); EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);
/*
* Called after each bus is probed, but before its children are examined. This
* is marked as __weak because multiple architectures define it.
*/
void __weak pcibios_fixup_bus(struct pci_bus *bus)
{
/* nothing to do, expected to be removed in the future */
}
unsigned int pci_scan_child_bus(struct pci_bus *bus) unsigned int pci_scan_child_bus(struct pci_bus *bus)
{ {
unsigned int devfn, pass, max = bus->busn_res.start; unsigned int devfn, pass, max = bus->busn_res.start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment