Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e822a007 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'topic/sebastian-devinit-fixups' into next 

* topic/sebastian-devinit-fixups:
  scripts/modpost: check for bad references in .pci.fixups area
  sh/PCI: move fixup hooks from __init to __devinit
  powerpc/PCI: move fixup hooks from __init to __devinit
  frv/PCI: move fixup hooks from __init to __devinit
  arm/PCI: move fixup hooks from __init to __devinit
  alpha/PCI: move fixup hooks from __init to __devinit
  PCI: move fixup hooks from __init to __devinit
  x86/PCI: move fixup hooks from __init to __devinit
parents 47fcb6da bb15d8db

arch/alpha/kernel/pci.c

+3 −6
Original line number Diff line number Diff line
@@ -59,15 +59,13 @@ struct pci_controller *pci_isa_hose; 
 * Quirks.

 */



static void __init

quirk_isa_bridge(struct pci_dev *dev)

static void __devinit quirk_isa_bridge(struct pci_dev *dev)

{

	dev->class = PCI_CLASS_BRIDGE_ISA << 8;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);



static void __init

quirk_cypress(struct pci_dev *dev)

static void __devinit quirk_cypress(struct pci_dev *dev)

{

	/* The Notorious Cy82C693 chip.  */
@@ -106,8 +104,7 @@ quirk_cypress(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress);



/* Called for each device after PCI setup is done. */

static void __init

pcibios_fixup_final(struct pci_dev *dev)

static void __devinit pcibios_fixup_final(struct pci_dev *dev)

{

	unsigned int class = dev->class >> 8;

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693);



static void __init pci_fixup_it8152(struct pci_dev *dev)

static void __devinit pci_fixup_it8152(struct pci_dev *dev)

{

	int i;

	/* fixup for ITE 8152 devices */

arch/frv/mb93090-mb00/pci-vdk.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void __init pci_fixup_umc_ide(struct pci_dev *d) 
		d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO;

}



static void __init pci_fixup_ide_bases(struct pci_dev *d)

static void __devinit pci_fixup_ide_bases(struct pci_dev *d)

{

	int i;
@@ -287,7 +287,7 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d) 
	}

}



static void __init pci_fixup_ide_trash(struct pci_dev *d)

static void __devinit pci_fixup_ide_trash(struct pci_dev *d)

{

	int i;

arch/powerpc/platforms/85xx/tqm85xx.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m) 
	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));

}



static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev)

static void __devinit tqm85xx_ti1520_fixup(struct pci_dev *pdev)

{

	unsigned int val;

arch/powerpc/platforms/86xx/gef_ppc9a.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void gef_ppc9a_show_cpuinfo(struct seq_file *m) 
		gef_ppc9a_get_vme_is_syscon() ? "yes" : "no");

}



static void __init gef_ppc9a_nec_fixup(struct pci_dev *pdev)

static void __devinit gef_ppc9a_nec_fixup(struct pci_dev *pdev)

{

	unsigned int val;