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

Commit fd95ee73 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: fix section mismatch in pcibios_fixup_bus 



Remove __init annotation from pcibios_fixup_bus as is called from
pci_scan_child_bus which is not __init.

Also fix a couple of minor build warnings.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent dc2bffa7

arch/xtensa/kernel/pci.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -77,9 +77,9 @@ pcibios_align_resource(void *data, const struct resource *res, 




	if (res->flags & IORESOURCE_IO) {

	if (res->flags & IORESOURCE_IO) {

		if (size > 0x100) {

		if (size > 0x100) {

			printk(KERN_ERR "PCI: I/O Region %s/%d too large"

			pr_err("PCI: I/O Region %s/%d too large (%u bytes)\n",

			       " (%ld bytes)\n", pci_name(dev),

					pci_name(dev), dev->resource - res,

			       dev->resource - res, size);

					size);

		}

		}





		if (start & 0x300)

		if (start & 0x300)
@@ -174,7 +174,7 @@ static int __init pcibios_init(void) 
	struct pci_controller *pci_ctrl;

	struct pci_controller *pci_ctrl;

	struct list_head resources;

	struct list_head resources;

	struct pci_bus *bus;

	struct pci_bus *bus;

	int next_busno = 0, i;

	int next_busno = 0;





	printk("PCI: Probing PCI hardware\n");

	printk("PCI: Probing PCI hardware\n");
@@ -197,7 +197,7 @@ static int __init pcibios_init(void) 




subsys_initcall(pcibios_init);

subsys_initcall(pcibios_init);





void __init pcibios_fixup_bus(struct pci_bus *bus)

void pcibios_fixup_bus(struct pci_bus *bus)

{

{

	if (bus->parent) {

	if (bus->parent) {

		/* This is a subordinate bridge */

		/* This is a subordinate bridge */