Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4105717b authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Greg Kroah-Hartman
Browse files

PCI: fix section mismatch warnings referring to pci_do_scan_bus 



Fix following warnings:
WARNING: o-x86_64/drivers/pci/built-in.o(.text+0xb054): Section mismatch in reference from the function cpci_configure_slot() to the function .devinit.text:pci_do_scan_bus()
WARNING: o-x86_64/drivers/pci/built-in.o(.text+0x153ab): Section mismatch in reference from the function shpchp_configure_device() to the function .devinit.text:pci_do_scan_bus()
WARNING: o-x86_64/drivers/pci/built-in.o(__ksymtab+0xc0): Section mismatch in reference from the variable __ksymtab_pci_do_scan_bus to the function .devinit.text:pci_do_scan_bus()

PCI hotplug were the only user of pci_do_scan_bus()
so moving this function to a separate file that is build
only when we enable CONFIG_HOTPLUG_PCI.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d5f78fb0

drivers/pci/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o 


# Build the PCI Hotplug drivers if we were asked to

obj-$(CONFIG_HOTPLUG_PCI) += hotplug/

ifdef CONFIG_HOTPLUG_PCI

obj-y += hotplug-pci.o

endif



# Build the PCI MSI interrupt support

obj-$(CONFIG_PCI_MSI) += msi.o

drivers/pci/hotplug-pci.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* Core PCI functionality used only by PCI hotplug */



#include <linux/pci.h>

#include "pci.h"





unsigned int pci_do_scan_bus(struct pci_bus *bus)

{

	unsigned int max;



	max = pci_scan_child_bus(bus);



	/*

	 * Make the discovered devices available.

	 */

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL(pci_do_scan_bus);

drivers/pci/probe.c

+0 −15
Original line number Diff line number Diff line
@@ -1040,20 +1040,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) 
	return max;

}



unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)

{

	unsigned int max;



	max = pci_scan_child_bus(bus);



	/*

	 * Make the discovered devices available.

	 */

	pci_bus_add_devices(bus);



	return max;

}



struct pci_bus * pci_create_bus(struct device *parent,

		int bus, struct pci_ops *ops, void *sysdata)

{
@@ -1140,7 +1126,6 @@ EXPORT_SYMBOL(pci_scan_bus_parented); 


#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pci_add_new_bus);

EXPORT_SYMBOL(pci_do_scan_bus);

EXPORT_SYMBOL(pci_scan_slot);

EXPORT_SYMBOL(pci_scan_bridge);

EXPORT_SYMBOL_GPL(pci_scan_child_bus);