aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-07-09 22:56:54 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-07-09 22:56:54 -0400
commit9349b44a459677e270ae19a373c58e5c3edbff04 (patch)
tree630d4e337691b959b663b79060360fb725a8396a /arch/mips
parenta7711ba1090a5fa1caa6e07182ac4e8e1c0da695 (diff)
parent735bff10c157fdbba2291e10ca3e28a59c7acc1c (diff)
Merge branch 'pci/myron-final-fixups-v2' into next
* pci/myron-final-fixups-v2: PCI: call final fixups hot-added devices PCI: move final fixups from __init to __devinit x86/PCI: move final fixups from __init to __devinit MIPS/PCI: move final fixups from __init to __devinit PCI: never discard enable/suspend/resume_early/resume fixups PCI: release temporary reference in __nv_msi_ht_cap_quirk() PCI: restructure 'pci_do_fixups()'
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/mti-malta/malta-pci.c2
-rw-r--r--arch/mips/pci/ops-tx4927.c2
-rw-r--r--arch/mips/txx9/generic/pci.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c
index bf80921f2f56..b6634025d67c 100644
--- a/arch/mips/mti-malta/malta-pci.c
+++ b/arch/mips/mti-malta/malta-pci.c
@@ -253,7 +253,7 @@ void __init mips_pcibios_init(void)
253} 253}
254 254
255/* Enable PCI 2.1 compatibility in PIIX4 */ 255/* Enable PCI 2.1 compatibility in PIIX4 */
256static void __init quirk_dlcsetup(struct pci_dev *dev) 256static void __devinit quirk_dlcsetup(struct pci_dev *dev)
257{ 257{
258 u8 odlc, ndlc; 258 u8 odlc, ndlc;
259 (void) pci_read_config_byte(dev, 0x82, &odlc); 259 (void) pci_read_config_byte(dev, 0x82, &odlc);
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
index a1e7e6d80c8c..bc13e29d2bb3 100644
--- a/arch/mips/pci/ops-tx4927.c
+++ b/arch/mips/pci/ops-tx4927.c
@@ -495,7 +495,7 @@ irqreturn_t tx4927_pcierr_interrupt(int irq, void *dev_id)
495} 495}
496 496
497#ifdef CONFIG_TOSHIBA_FPCIB0 497#ifdef CONFIG_TOSHIBA_FPCIB0
498static void __init tx4927_quirk_slc90e66_bridge(struct pci_dev *dev) 498static void __devinit tx4927_quirk_slc90e66_bridge(struct pci_dev *dev)
499{ 499{
500 struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(dev->bus); 500 struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(dev->bus);
501 501
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index f028e3dc25fb..125db323ab1e 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -256,7 +256,7 @@ static irqreturn_t i8259_interrupt(int irq, void *dev_id)
256 return IRQ_HANDLED; 256 return IRQ_HANDLED;
257} 257}
258 258
259static int __init 259static int __devinit
260txx9_i8259_irq_setup(int irq) 260txx9_i8259_irq_setup(int irq)
261{ 261{
262 int err; 262 int err;
@@ -269,7 +269,7 @@ txx9_i8259_irq_setup(int irq)
269 return err; 269 return err;
270} 270}
271 271
272static void __init quirk_slc90e66_bridge(struct pci_dev *dev) 272static void __devinit quirk_slc90e66_bridge(struct pci_dev *dev)
273{ 273{
274 int irq; /* PCI/ISA Bridge interrupt */ 274 int irq; /* PCI/ISA Bridge interrupt */
275 u8 reg_64; 275 u8 reg_64;