Skip to content

Commit 74a70e8

Browse files
hkallweitbjorn-helgaas
authored andcommitted
PCI: Remove pci_fixup_cardbus()
Since 1c7f4fe ("powerpc/pci: Remove pcibios_setup_bus_devices()") there's no architecture left setting pci_fixup_cardbus. Therefore remove support from PCI core. Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 0af2f6b commit 74a70e8

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

drivers/pci/pci.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6806,11 +6806,6 @@ int __weak pci_ext_cfg_avail(void)
68066806
return 1;
68076807
}
68086808

6809-
void __weak pci_fixup_cardbus(struct pci_bus *bus)
6810-
{
6811-
}
6812-
EXPORT_SYMBOL(pci_fixup_cardbus);
6813-
68146809
static int __init pci_setup(char *str)
68156810
{
68166811
while (str) {

drivers/pcmcia/cardbus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ int __ref cb_alloc(struct pcmcia_socket *s)
7272
pci_lock_rescan_remove();
7373

7474
s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));
75-
pci_fixup_cardbus(bus);
7675

7776
max = bus->busn_res.start;
7877
for (pass = 0; pass < 2; pass++)

include/linux/pci.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,9 +1139,6 @@ resource_size_t pcibios_align_resource(void *, const struct resource *,
11391139
resource_size_t,
11401140
resource_size_t);
11411141

1142-
/* Weak but can be overridden by arch */
1143-
void pci_fixup_cardbus(struct pci_bus *);
1144-
11451142
/* Generic PCI functions used internally */
11461143

11471144
void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,

0 commit comments

Comments
 (0)