Skip to content

Commit

Permalink
xtensa: fix section mismatch in pcibios_fixup_bus
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Max Filippov authored and Chris Zankel committed Jun 5, 2013
1 parent dc2bffa commit fd95ee7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/xtensa/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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");

Expand All @@ -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 */
Expand Down

0 comments on commit fd95ee7

Please sign in to comment.