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

Commit 9b9a6d26 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/thierry-fixup-irqs' into next 

* pci/thierry-fixup-irqs:
  PCI: Provide a default pcibios_update_irq()
  PCI: Discard __init annotations for pci_fixup_irqs() and related functions
parents 8704936a 8885b7b6

arch/alpha/kernel/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -256,12 +256,6 @@ pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



void __init

pcibios_update_irq(struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



int

pcibios_enable_device(struct pci_dev *dev, int mask)

{

arch/arm/kernel/bios32.c

+0 −9
Original line number Diff line number Diff line
@@ -270,15 +270,6 @@ static void __devinit pci_fixup_it8152(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8152, pci_fixup_it8152);







void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)

{

	if (debug_pci)

		printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev));

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



/*

 * If the bus contains any of these devices, then we must not turn on

 * parity checking of any kind.  Currently this is CyberPro 20x0 only.

arch/ia64/pci/pci.c

+0 −8
Original line number Diff line number Diff line
@@ -461,14 +461,6 @@ void pcibios_set_master (struct pci_dev *dev) 
	/* No special bus mastering setup handling */

}



void __devinit

pcibios_update_irq (struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);



	/* ??? FIXME -- record old value for shutdown.  */

}



int

pcibios_enable_device (struct pci_dev *dev, int mask)

{

arch/m68k/kernel/pcibios.c

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	return 0;

}



void pcibios_update_irq(struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



void __devinit pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_dev *dev;

arch/mips/pci/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -313,12 +313,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



void __init

pcibios_update_irq(struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(PCIBIOS_MIN_IO);

EXPORT_SYMBOL(PCIBIOS_MIN_MEM);