aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel/pci.c
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2013-05-27 11:45:58 -0400
committerChris Zankel <chris@zankel.net>2013-06-05 13:14:22 -0400
commitfd95ee7380ae973c6f11b897af6ef9d253a1df9e (patch)
treeafe5b0dc9d63835053b5a003b5ceaf07cf144706 /arch/xtensa/kernel/pci.c
parentdc2bffa77a2866a451126cf3146abb9787edce78 (diff)
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/xtensa/kernel/pci.c')
-rw-r--r--arch/xtensa/kernel/pci.c10
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,
77 77
78 if (res->flags & IORESOURCE_IO) { 78 if (res->flags & IORESOURCE_IO) {
79 if (size > 0x100) { 79 if (size > 0x100) {
80 printk(KERN_ERR "PCI: I/O Region %s/%d too large" 80 pr_err("PCI: I/O Region %s/%d too large (%u bytes)\n",
81 " (%ld bytes)\n", pci_name(dev), 81 pci_name(dev), dev->resource - res,
82 dev->resource - res, size); 82 size);
83 } 83 }
84 84
85 if (start & 0x300) 85 if (start & 0x300)
@@ -174,7 +174,7 @@ static int __init pcibios_init(void)
174 struct pci_controller *pci_ctrl; 174 struct pci_controller *pci_ctrl;
175 struct list_head resources; 175 struct list_head resources;
176 struct pci_bus *bus; 176 struct pci_bus *bus;
177 int next_busno = 0, i; 177 int next_busno = 0;
178 178
179 printk("PCI: Probing PCI hardware\n"); 179 printk("PCI: Probing PCI hardware\n");
180 180
@@ -197,7 +197,7 @@ static int __init pcibios_init(void)
197 197
198subsys_initcall(pcibios_init); 198subsys_initcall(pcibios_init);
199 199
200void __init pcibios_fixup_bus(struct pci_bus *bus) 200void pcibios_fixup_bus(struct pci_bus *bus)
201{ 201{
202 if (bus->parent) { 202 if (bus->parent) {
203 /* This is a subordinate bridge */ 203 /* This is a subordinate bridge */