diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 17:05:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:13 -0500 |
commit | f8d6c8d98d9ea7afef1e0d93d756a2dca879d1ea (patch) | |
tree | 7a752d68006742a330d095ce2085ba81a7cd189f /arch/alpha/kernel/pci.c | |
parent | 5b5e76e9cb294fc01cc81d21cd7b5feead067a40 (diff) |
ALPHA: drivers: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha/kernel/pci.c')
-rw-r--r-- | arch/alpha/kernel/pci.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index ef757147cbf9..edb4e0097b75 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
@@ -59,13 +59,13 @@ struct pci_controller *pci_isa_hose; | |||
59 | * Quirks. | 59 | * Quirks. |
60 | */ | 60 | */ |
61 | 61 | ||
62 | static void __devinit quirk_isa_bridge(struct pci_dev *dev) | 62 | static void quirk_isa_bridge(struct pci_dev *dev) |
63 | { | 63 | { |
64 | dev->class = PCI_CLASS_BRIDGE_ISA << 8; | 64 | dev->class = PCI_CLASS_BRIDGE_ISA << 8; |
65 | } | 65 | } |
66 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge); | 66 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge); |
67 | 67 | ||
68 | static void __devinit quirk_cypress(struct pci_dev *dev) | 68 | static void quirk_cypress(struct pci_dev *dev) |
69 | { | 69 | { |
70 | /* The Notorious Cy82C693 chip. */ | 70 | /* The Notorious Cy82C693 chip. */ |
71 | 71 | ||
@@ -104,7 +104,7 @@ static void __devinit quirk_cypress(struct pci_dev *dev) | |||
104 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress); | 104 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress); |
105 | 105 | ||
106 | /* Called for each device after PCI setup is done. */ | 106 | /* Called for each device after PCI setup is done. */ |
107 | static void __devinit pcibios_fixup_final(struct pci_dev *dev) | 107 | static void pcibios_fixup_final(struct pci_dev *dev) |
108 | { | 108 | { |
109 | unsigned int class = dev->class >> 8; | 109 | unsigned int class = dev->class >> 8; |
110 | 110 | ||
@@ -198,8 +198,7 @@ subsys_initcall(pcibios_init); | |||
198 | #ifdef ALPHA_RESTORE_SRM_SETUP | 198 | #ifdef ALPHA_RESTORE_SRM_SETUP |
199 | static struct pdev_srm_saved_conf *srm_saved_configs; | 199 | static struct pdev_srm_saved_conf *srm_saved_configs; |
200 | 200 | ||
201 | void __devinit | 201 | void pdev_save_srm_config(struct pci_dev *dev) |
202 | pdev_save_srm_config(struct pci_dev *dev) | ||
203 | { | 202 | { |
204 | struct pdev_srm_saved_conf *tmp; | 203 | struct pdev_srm_saved_conf *tmp; |
205 | static int printed = 0; | 204 | static int printed = 0; |
@@ -241,8 +240,7 @@ pci_restore_srm_config(void) | |||
241 | } | 240 | } |
242 | #endif | 241 | #endif |
243 | 242 | ||
244 | void __devinit | 243 | void pcibios_fixup_bus(struct pci_bus *bus) |
245 | pcibios_fixup_bus(struct pci_bus *bus) | ||
246 | { | 244 | { |
247 | struct pci_dev *dev = bus->self; | 245 | struct pci_dev *dev = bus->self; |
248 | 246 | ||