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 /arch/tile | |
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 'arch/tile')
-rw-r--r-- | arch/tile/kernel/pci.c | 2 | ||||
-rw-r--r-- | arch/tile/kernel/pci_gx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 33c10864d2f7..6245bba8b1d6 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c | |||
@@ -406,7 +406,7 @@ void pcibios_set_master(struct pci_dev *dev) | |||
406 | /* | 406 | /* |
407 | * This is called from the generic Linux layer. | 407 | * This is called from the generic Linux layer. |
408 | */ | 408 | */ |
409 | void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) | 409 | void pcibios_update_irq(struct pci_dev *dev, int irq) |
410 | { | 410 | { |
411 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | 411 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); |
412 | } | 412 | } |
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 0e213e35ffc3..5faad0b1bd21 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c | |||
@@ -1036,7 +1036,7 @@ char __devinit *pcibios_setup(char *str) | |||
1036 | /* | 1036 | /* |
1037 | * This is called from the generic Linux layer. | 1037 | * This is called from the generic Linux layer. |
1038 | */ | 1038 | */ |
1039 | void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) | 1039 | void pcibios_update_irq(struct pci_dev *dev, int irq) |
1040 | { | 1040 | { |
1041 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | 1041 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); |
1042 | } | 1042 | } |