[PATCH] PCI: Remove pci_fixup_cardbus

[PATCH] PCI: Remove pci_fixup_cardbus

[Heiner Kallweit]

Since 1c7f4fe86f17 ("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 <hkallweit1@gmail.com>
---
 drivers/pci/pci.c        | 5 -----
 drivers/pcmcia/cardbus.c | 1 -
 include/linux/pci.h      | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4d7c9f64e..c24d6f5a1 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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) {
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 45c8252c8..5e5cf2c3e 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -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++)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0e8e3fd77..d26e6611b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -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,
-- 
2.49.0

Re: [PATCH] PCI: Remove pci_fixup_cardbus

[Bjorn Helgaas]

On Wed, Apr 09, 2025 at 10:43:10PM +0200, Heiner Kallweit wrote:
> Since 1c7f4fe86f17 ("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 <hkallweit1@gmail.com>

Great, always nice to remove things, thanks!

Applied to pci/enumeration for v6.16.

> ---
>  drivers/pci/pci.c        | 5 -----
>  drivers/pcmcia/cardbus.c | 1 -
>  include/linux/pci.h      | 3 ---
>  3 files changed, 9 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 4d7c9f64e..c24d6f5a1 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -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) {
> diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
> index 45c8252c8..5e5cf2c3e 100644
> --- a/drivers/pcmcia/cardbus.c
> +++ b/drivers/pcmcia/cardbus.c
> @@ -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++)
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 0e8e3fd77..d26e6611b 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -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,
> -- 
> 2.49.0
>