Commit 74a70e80 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas
Browse files

PCI: Remove pci_fixup_cardbus() 



Since 1c7f4fe8 ("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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/8de7da4c-2b16-4ee1-8c42-0d04f3c821c6@gmail.com
parent 0af2f6be

drivers/pci/pci.c

+0 −5
Original line number Diff line number Diff line
@@ -6806,11 +6806,6 @@ int __weak pci_ext_cfg_avail(void) 
	return 1;

}



void __weak pci_fixup_cardbus(struct pci_bus *bus)

{

}

EXPORT_SYMBOL(pci_fixup_cardbus);



static int __init pci_setup(char *str)

{

	while (str) {

drivers/pcmcia/cardbus.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ int __ref cb_alloc(struct pcmcia_socket *s) 
	pci_lock_rescan_remove();



	s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));

	pci_fixup_cardbus(bus);



	max = bus->busn_res.start;

	for (pass = 0; pass < 2; pass++)

include/linux/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -1139,9 +1139,6 @@ resource_size_t pcibios_align_resource(void *, const struct resource *, 
				resource_size_t,

				resource_size_t);



/* Weak but can be overridden by arch */

void pci_fixup_cardbus(struct pci_bus *);



/* Generic PCI functions used internally */



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