PCI: Discard __init annotations for pci_fixup_irqs() and related functions
Remove the __init annotations in order to keep pci_fixup_irqs() around after init (e.g. for hotplug). This requires the same change for the implementation of pcibios_update_irq() on all architectures. While at it, all __devinit annotations are removed as well, since they will be useless now that HOTPLUG is always on. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
55d512e245
Коммит
3ddbebf878
|
@ -256,7 +256,7 @@ pcibios_fixup_bus(struct pci_bus *bus)
|
|||
}
|
||||
}
|
||||
|
||||
void __init
|
||||
void
|
||||
pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
|
|
|
@ -272,7 +272,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8152, pci_fixup_it
|
|||
|
||||
|
||||
|
||||
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
if (debug_pci)
|
||||
printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev));
|
||||
|
|
|
@ -461,7 +461,7 @@ void pcibios_set_master (struct pci_dev *dev)
|
|||
/* No special bus mastering setup handling */
|
||||
}
|
||||
|
||||
void __devinit
|
||||
void
|
||||
pcibios_update_irq (struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
|
|
|
@ -313,7 +313,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
|
|||
}
|
||||
}
|
||||
|
||||
void __init
|
||||
void
|
||||
pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
|
|
|
@ -192,7 +192,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|||
return pci_enable_resources(dev, mask);
|
||||
}
|
||||
|
||||
void __init pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|||
return pci_enable_resources(dev, mask);
|
||||
}
|
||||
|
||||
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
#ifdef CONFIG_PCI_DEBUG
|
||||
printk(KERN_DEBUG "LEONPCI: Assigning IRQ %02d to %s\n", irq,
|
||||
|
|
|
@ -406,7 +406,7 @@ void pcibios_set_master(struct pci_dev *dev)
|
|||
/*
|
||||
* This is called from the generic Linux layer.
|
||||
*/
|
||||
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
}
|
||||
|
|
|
@ -1036,7 +1036,7 @@ char __devinit *pcibios_setup(char *str)
|
|||
/*
|
||||
* This is called from the generic Linux layer.
|
||||
*/
|
||||
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ void __init puv3_pci_adjust_zones(unsigned long *zone_size,
|
|||
zhole_size[0] = 0;
|
||||
}
|
||||
|
||||
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
if (debug_pci)
|
||||
printk(KERN_DEBUG "PCI: Assigning IRQ %02d to %s\n",
|
||||
|
|
|
@ -62,7 +62,7 @@ out:
|
|||
return irq;
|
||||
}
|
||||
|
||||
void __init pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
void pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
}
|
||||
|
|
|
@ -212,7 +212,7 @@ void pcibios_set_master(struct pci_dev *dev)
|
|||
|
||||
/* the next one is stolen from the alpha port... */
|
||||
|
||||
void __init
|
||||
void
|
||||
pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||
{
|
||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <linux/cache.h>
|
||||
|
||||
|
||||
static void __init
|
||||
static void
|
||||
pdev_fixup_irq(struct pci_dev *dev,
|
||||
u8 (*swizzle)(struct pci_dev *, u8 *),
|
||||
int (*map_irq)(const struct pci_dev *, u8, u8))
|
||||
|
@ -54,7 +54,7 @@ pdev_fixup_irq(struct pci_dev *dev,
|
|||
pcibios_update_irq(dev, irq);
|
||||
}
|
||||
|
||||
void __init
|
||||
void
|
||||
pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
|
||||
int (*map_irq)(const struct pci_dev *, u8, u8))
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче