diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-09-17 07:22:53 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-18 19:22:25 -0400 |
commit | 3ddbebf878ac8d958bb34e87a742a6b3adc283a3 (patch) | |
tree | 6b398c32ec6b9f29e8daa0bc9c509ea5e17fba7e /drivers/pci | |
parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) |
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/setup-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index eb219a1d16f7..270ae7b97120 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/cache.h> | 18 | #include <linux/cache.h> |
19 | 19 | ||
20 | 20 | ||
21 | static void __init | 21 | static void |
22 | pdev_fixup_irq(struct pci_dev *dev, | 22 | pdev_fixup_irq(struct pci_dev *dev, |
23 | u8 (*swizzle)(struct pci_dev *, u8 *), | 23 | u8 (*swizzle)(struct pci_dev *, u8 *), |
24 | int (*map_irq)(const struct pci_dev *, u8, u8)) | 24 | int (*map_irq)(const struct pci_dev *, u8, u8)) |
@@ -54,7 +54,7 @@ pdev_fixup_irq(struct pci_dev *dev, | |||
54 | pcibios_update_irq(dev, irq); | 54 | pcibios_update_irq(dev, irq); |
55 | } | 55 | } |
56 | 56 | ||
57 | void __init | 57 | void |
58 | pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *), | 58 | pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *), |
59 | int (*map_irq)(const struct pci_dev *, u8, u8)) | 59 | int (*map_irq)(const struct pci_dev *, u8, u8)) |
60 | { | 60 | { |