Commit 3ddbebf8 authored by Thierry Reding's avatar Thierry Reding Committed by Bjorn Helgaas

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: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55d512e2
...@@ -256,7 +256,7 @@ pcibios_fixup_bus(struct pci_bus *bus) ...@@ -256,7 +256,7 @@ pcibios_fixup_bus(struct pci_bus *bus)
} }
} }
void __init void
pcibios_update_irq(struct pci_dev *dev, int irq) pcibios_update_irq(struct pci_dev *dev, int irq)
{ {
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 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 ...@@ -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) if (debug_pci)
printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev)); printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev));
......
...@@ -461,7 +461,7 @@ void pcibios_set_master (struct pci_dev *dev) ...@@ -461,7 +461,7 @@ void pcibios_set_master (struct pci_dev *dev)
/* No special bus mastering setup handling */ /* No special bus mastering setup handling */
} }
void __devinit void
pcibios_update_irq (struct pci_dev *dev, int irq) pcibios_update_irq (struct pci_dev *dev, int irq)
{ {
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
......
...@@ -313,7 +313,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) ...@@ -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) pcibios_update_irq(struct pci_dev *dev, int irq)
{ {
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
......
...@@ -192,7 +192,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) ...@@ -192,7 +192,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pci_enable_resources(dev, 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); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
} }
......
...@@ -102,7 +102,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) ...@@ -102,7 +102,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pci_enable_resources(dev, 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 #ifdef CONFIG_PCI_DEBUG
printk(KERN_DEBUG "LEONPCI: Assigning IRQ %02d to %s\n", irq, printk(KERN_DEBUG "LEONPCI: Assigning IRQ %02d to %s\n", irq,
......
...@@ -406,7 +406,7 @@ void pcibios_set_master(struct pci_dev *dev) ...@@ -406,7 +406,7 @@ void pcibios_set_master(struct pci_dev *dev)
/* /*
* This is called from the generic Linux layer. * 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); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
} }
......
...@@ -1036,7 +1036,7 @@ char __devinit *pcibios_setup(char *str) ...@@ -1036,7 +1036,7 @@ char __devinit *pcibios_setup(char *str)
/* /*
* This is called from the generic Linux layer. * 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); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
} }
......
...@@ -154,7 +154,7 @@ void __init puv3_pci_adjust_zones(unsigned long *zone_size, ...@@ -154,7 +154,7 @@ void __init puv3_pci_adjust_zones(unsigned long *zone_size,
zhole_size[0] = 0; 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) if (debug_pci)
printk(KERN_DEBUG "PCI: Assigning IRQ %02d to %s\n", printk(KERN_DEBUG "PCI: Assigning IRQ %02d to %s\n",
......
...@@ -62,7 +62,7 @@ static int __init visws_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) ...@@ -62,7 +62,7 @@ static int __init visws_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
return irq; 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); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
} }
......
...@@ -212,7 +212,7 @@ void pcibios_set_master(struct pci_dev *dev) ...@@ -212,7 +212,7 @@ void pcibios_set_master(struct pci_dev *dev)
/* the next one is stolen from the alpha port... */ /* the next one is stolen from the alpha port... */
void __init void
pcibios_update_irq(struct pci_dev *dev, int irq) pcibios_update_irq(struct pci_dev *dev, int irq)
{ {
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/cache.h> #include <linux/cache.h>
static void __init static void
pdev_fixup_irq(struct pci_dev *dev, pdev_fixup_irq(struct pci_dev *dev,
u8 (*swizzle)(struct pci_dev *, u8 *), u8 (*swizzle)(struct pci_dev *, u8 *),
int (*map_irq)(const struct pci_dev *, u8, u8)) int (*map_irq)(const struct pci_dev *, u8, u8))
...@@ -54,7 +54,7 @@ pdev_fixup_irq(struct pci_dev *dev, ...@@ -54,7 +54,7 @@ pdev_fixup_irq(struct pci_dev *dev,
pcibios_update_irq(dev, irq); pcibios_update_irq(dev, irq);
} }
void __init void
pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *), pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
int (*map_irq)(const struct pci_dev *, u8, u8)) int (*map_irq)(const struct pci_dev *, u8, u8))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment