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

Commit 0ab2b57f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Greg Kroah-Hartman
Browse files

PCI: fix section mismatch warning in pci_scan_child_bus 



Fix following warning:
WARNING: vmlinux.o(.text+0x47bdb1): Section mismatch in reference from the function pci_scan_child_bus() to the function .devinit.text:pcibios_fixup_bus()

We had plenty of functions that could be annotated __devinit but due to
the former restriction that exported symbols could not be annotated
they were not so.  So annotate these function and fix the references
from the pci/hotplug/* code to silence the resuting warnings.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 415b6d0e

drivers/pci/hotplug-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "pci.h"





unsigned int pci_do_scan_bus(struct pci_bus *bus)

unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)

{

	unsigned int max;

drivers/pci/hotplug/acpiphp_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ static int acpiphp_bus_trim(acpi_handle handle) 
 * This function should be called per *physical slot*,

 * not per each slot object in ACPI namespace.

 */

static int enable_device(struct acpiphp_slot *slot)

static int __ref enable_device(struct acpiphp_slot *slot)

{

	struct pci_dev *dev;

	struct pci_bus *bus = slot->bridge->pci_bus;

drivers/pci/hotplug/cpci_hotplug_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ int cpci_led_off(struct slot* slot) 
 * Device configuration functions

 */



int cpci_configure_slot(struct slot* slot)

int __ref cpci_configure_slot(struct slot *slot)

{

	struct pci_bus *parent;

	int fn;

drivers/pci/hotplug/pciehp_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static void program_fw_provided_values(struct pci_dev *dev) 
	}

}



static int pciehp_add_bridge(struct pci_dev *dev)

static int __ref pciehp_add_bridge(struct pci_dev *dev)

{

	struct pci_bus *parent = dev->bus;

	int pass, busnr, start = parent->secondary;

drivers/pci/hotplug/shpchp_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void program_fw_provided_values(struct pci_dev *dev) 
	}

}



int shpchp_configure_device(struct slot *p_slot)

int __ref shpchp_configure_device(struct slot *p_slot)

{

	struct pci_dev *dev;

	struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;