diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2013-05-27 17:45:58 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-06-05 19:14:22 +0200 |
| commit | fd95ee7380ae973c6f11b897af6ef9d253a1df9e (patch) | |
| tree | afe5b0dc9d63835053b5a003b5ceaf07cf144706 /arch | |
| parent | xtensa: ISS: fix section mismatch in iss_net_setup (diff) | |
| download | linux-fd95ee7380ae973c6f11b897af6ef9d253a1df9e.tar.xz linux-fd95ee7380ae973c6f11b897af6ef9d253a1df9e.zip | |
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: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index 126c18839409..5b3403388d7f 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c @@ -77,9 +77,9 @@ pcibios_align_resource(void *data, const struct resource *res, if (res->flags & IORESOURCE_IO) { if (size > 0x100) { - printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", pci_name(dev), - dev->resource - res, size); + pr_err("PCI: I/O Region %s/%d too large (%u bytes)\n", + pci_name(dev), dev->resource - res, + size); } if (start & 0x300) @@ -174,7 +174,7 @@ static int __init pcibios_init(void) struct pci_controller *pci_ctrl; struct list_head resources; struct pci_bus *bus; - int next_busno = 0, i; + int next_busno = 0; printk("PCI: Probing PCI hardware\n"); @@ -197,7 +197,7 @@ static int __init pcibios_init(void) subsys_initcall(pcibios_init); -void __init pcibios_fixup_bus(struct pci_bus *bus) +void pcibios_fixup_bus(struct pci_bus *bus) { if (bus->parent) { /* This is a subordinate bridge */ |