Skip to content

Commit

Permalink
MIPS/PCI: move final fixups from __init to __devinit
Browse files Browse the repository at this point in the history
Final fixups are executed during device enumeration.  If we support
hotplug, this may be after boot, so final fixups cannot be __init.

[bhelgaas: changelog]
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Myron Stowe authored and Bjorn Helgaas committed Jul 10, 2012
1 parent 25e742b commit 02d4b36
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/mips/mti-malta/malta-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void __init mips_pcibios_init(void)
}

/* Enable PCI 2.1 compatibility in PIIX4 */
static void __init quirk_dlcsetup(struct pci_dev *dev)
static void __devinit quirk_dlcsetup(struct pci_dev *dev)
{
u8 odlc, ndlc;
(void) pci_read_config_byte(dev, 0x82, &odlc);
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/pci/ops-tx4927.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ irqreturn_t tx4927_pcierr_interrupt(int irq, void *dev_id)
}

#ifdef CONFIG_TOSHIBA_FPCIB0
static void __init tx4927_quirk_slc90e66_bridge(struct pci_dev *dev)
static void __devinit tx4927_quirk_slc90e66_bridge(struct pci_dev *dev)
{
struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(dev->bus);

Expand Down
4 changes: 2 additions & 2 deletions arch/mips/txx9/generic/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static irqreturn_t i8259_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}

static int __init
static int __devinit
txx9_i8259_irq_setup(int irq)
{
int err;
Expand All @@ -269,7 +269,7 @@ txx9_i8259_irq_setup(int irq)
return err;
}

static void __init quirk_slc90e66_bridge(struct pci_dev *dev)
static void __devinit quirk_slc90e66_bridge(struct pci_dev *dev)
{
int irq; /* PCI/ISA Bridge interrupt */
u8 reg_64;
Expand Down

0 comments on commit 02d4b36

Please sign in to comment.