aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:21:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:03 -0500
commitfe31edc8a3b6081f3580c9ae4c5c61103f3412a5 (patch)
tree84b9d3b008f33031093a73a7bec7f422f3a7eff8
parent0ec24914675c48213378da550db494bf154f0f6c (diff)
Drivers: ide: 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, __devinitconst, 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: "David S. Miller" <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/ide/aec62xx.c8
-rw-r--r--drivers/ide/alim15x3.c10
-rw-r--r--drivers/ide/amd74xx.c4
-rw-r--r--drivers/ide/atiixp.c4
-rw-r--r--drivers/ide/cmd64x.c4
-rw-r--r--drivers/ide/cs5520.c4
-rw-r--r--drivers/ide/cs5530.c6
-rw-r--r--drivers/ide/cs5535.c5
-rw-r--r--drivers/ide/cy82c693.c11
-rw-r--r--drivers/ide/delkin_cb.c5
-rw-r--r--drivers/ide/hpt366.c42
-rw-r--r--drivers/ide/icside.c15
-rw-r--r--drivers/ide/ide-pci-generic.c4
-rw-r--r--drivers/ide/ide_platform.c14
-rw-r--r--drivers/ide/it8172.c5
-rw-r--r--drivers/ide/it8213.c4
-rw-r--r--drivers/ide/it821x.c10
-rw-r--r--drivers/ide/jmicron.c4
-rw-r--r--drivers/ide/ns87415.c8
-rw-r--r--drivers/ide/opti621.c4
-rw-r--r--drivers/ide/palm_bk3710.c7
-rw-r--r--drivers/ide/pdc202xx_new.c10
-rw-r--r--drivers/ide/pdc202xx_old.c8
-rw-r--r--drivers/ide/piix.c8
-rw-r--r--drivers/ide/pmac.c16
-rw-r--r--drivers/ide/rapide.c7
-rw-r--r--drivers/ide/rz1000.c6
-rw-r--r--drivers/ide/sc1200.c4
-rw-r--r--drivers/ide/scc_pata.c20
-rw-r--r--drivers/ide/serverworks.c4
-rw-r--r--drivers/ide/sgiioc4.c13
-rw-r--r--drivers/ide/siimage.c13
-rw-r--r--drivers/ide/sis5513.c10
-rw-r--r--drivers/ide/sl82c105.c4
-rw-r--r--drivers/ide/slc90e66.c5
-rw-r--r--drivers/ide/tc86c001.c12
-rw-r--r--drivers/ide/triflex.c5
-rw-r--r--drivers/ide/trm290.c6
-rw-r--r--drivers/ide/via82cxxx.c8
39 files changed, 162 insertions, 175 deletions
diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
index 01451940393b..c7eaf20af926 100644
--- a/drivers/ide/aec62xx.c
+++ b/drivers/ide/aec62xx.c
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
181 .cable_detect = atp86x_cable_detect, 181 .cable_detect = atp86x_cable_detect,
182}; 182};
183 183
184static const struct ide_port_info aec62xx_chipsets[] __devinitconst = { 184static const struct ide_port_info aec62xx_chipsets[] = {
185 { /* 0: AEC6210 */ 185 { /* 0: AEC6210 */
186 .name = DRV_NAME, 186 .name = DRV_NAME,
187 .init_chipset = init_chipset_aec62xx, 187 .init_chipset = init_chipset_aec62xx,
@@ -251,7 +251,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
251 * chips, pass a local copy of 'struct ide_port_info' down the call chain. 251 * chips, pass a local copy of 'struct ide_port_info' down the call chain.
252 */ 252 */
253 253
254static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id) 254static int aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
255{ 255{
256 const struct chipset_bus_clock_list_entry *bus_clock; 256 const struct chipset_bus_clock_list_entry *bus_clock;
257 struct ide_port_info d; 257 struct ide_port_info d;
@@ -287,7 +287,7 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
287 return err; 287 return err;
288} 288}
289 289
290static void __devexit aec62xx_remove(struct pci_dev *dev) 290static void aec62xx_remove(struct pci_dev *dev)
291{ 291{
292 ide_pci_remove(dev); 292 ide_pci_remove(dev);
293 pci_disable_device(dev); 293 pci_disable_device(dev);
@@ -307,7 +307,7 @@ static struct pci_driver aec62xx_pci_driver = {
307 .name = "AEC62xx_IDE", 307 .name = "AEC62xx_IDE",
308 .id_table = aec62xx_pci_tbl, 308 .id_table = aec62xx_pci_tbl,
309 .probe = aec62xx_init_one, 309 .probe = aec62xx_init_one,
310 .remove = __devexit_p(aec62xx_remove), 310 .remove = aec62xx_remove,
311 .suspend = ide_pci_suspend, 311 .suspend = ide_pci_suspend,
312 .resume = ide_pci_resume, 312 .resume = ide_pci_resume,
313}; 313};
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index 911a27ca356b..36f76e28a0bf 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -415,7 +415,7 @@ static u8 ali_cable_detect(ide_hwif_t *hwif)
415 * Sparc systems. 415 * Sparc systems.
416 */ 416 */
417 417
418static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 418static void init_hwif_ali15x3(ide_hwif_t *hwif)
419{ 419{
420 u8 ideic, inmir; 420 u8 ideic, inmir;
421 s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6, 421 s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6,
@@ -464,8 +464,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
464 * Set up the DMA functionality on the ALi 15x3. 464 * Set up the DMA functionality on the ALi 15x3.
465 */ 465 */
466 466
467static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, 467static int init_dma_ali15x3(ide_hwif_t *hwif, const struct ide_port_info *d)
468 const struct ide_port_info *d)
469{ 468{
470 struct pci_dev *dev = to_pci_dev(hwif->dev); 469 struct pci_dev *dev = to_pci_dev(hwif->dev);
471 unsigned long base = ide_pci_dma_base(hwif, d); 470 unsigned long base = ide_pci_dma_base(hwif, d);
@@ -512,7 +511,7 @@ static const struct ide_dma_ops ali_dma_ops = {
512 .dma_sff_read_status = ide_dma_sff_read_status, 511 .dma_sff_read_status = ide_dma_sff_read_status,
513}; 512};
514 513
515static const struct ide_port_info ali15x3_chipset __devinitconst = { 514static const struct ide_port_info ali15x3_chipset = {
516 .name = DRV_NAME, 515 .name = DRV_NAME,
517 .init_chipset = init_chipset_ali15x3, 516 .init_chipset = init_chipset_ali15x3,
518 .init_hwif = init_hwif_ali15x3, 517 .init_hwif = init_hwif_ali15x3,
@@ -532,7 +531,8 @@ static const struct ide_port_info ali15x3_chipset __devinitconst = {
532 * hot plug layer. 531 * hot plug layer.
533 */ 532 */
534 533
535static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) 534static int alim15x3_init_one(struct pci_dev *dev,
535 const struct pci_device_id *id)
536{ 536{
537 struct ide_port_info d = ali15x3_chipset; 537 struct ide_port_info d = ali15x3_chipset;
538 u8 rev = dev->revision, idx = id->driver_data; 538 u8 rev = dev->revision, idx = id->driver_data;
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
index 56fc99557ba2..cbfe846911d1 100644
--- a/drivers/ide/amd74xx.c
+++ b/drivers/ide/amd74xx.c
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
223 .udma_mask = udma, \ 223 .udma_mask = udma, \
224 } 224 }
225 225
226static const struct ide_port_info amd74xx_chipsets[] __devinitconst = { 226static const struct ide_port_info amd74xx_chipsets[] = {
227 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2), 227 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
228 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4), 228 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
229 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), 229 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
@@ -235,7 +235,7 @@ static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
235 /* 6: AMD5536 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), 235 /* 6: AMD5536 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
236}; 236};
237 237
238static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id) 238static int amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
239{ 239{
240 struct ide_port_info d; 240 struct ide_port_info d;
241 u8 idx = id->driver_data; 241 u8 idx = id->driver_data;
diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
index cb43480b1bd5..dbd0f242ec18 100644
--- a/drivers/ide/atiixp.c
+++ b/drivers/ide/atiixp.c
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
139 .cable_detect = atiixp_cable_detect, 139 .cable_detect = atiixp_cable_detect,
140}; 140};
141 141
142static const struct ide_port_info atiixp_pci_info[] __devinitconst = { 142static const struct ide_port_info atiixp_pci_info[] = {
143 { /* 0: IXP200/300/400/700 */ 143 { /* 0: IXP200/300/400/700 */
144 .name = DRV_NAME, 144 .name = DRV_NAME,
145 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, 145 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
@@ -168,7 +168,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
168 * finds a device matching our IDE device tables. 168 * finds a device matching our IDE device tables.
169 */ 169 */
170 170
171static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) 171static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
172{ 172{
173 return ide_pci_init_one(dev, &atiixp_pci_info[id->driver_data], NULL); 173 return ide_pci_init_one(dev, &atiixp_pci_info[id->driver_data], NULL);
174} 174}
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index d1fc43802f5d..b127ed60c733 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
327 .dma_sff_read_status = ide_dma_sff_read_status, 327 .dma_sff_read_status = ide_dma_sff_read_status,
328}; 328};
329 329
330static const struct ide_port_info cmd64x_chipsets[] __devinitconst = { 330static const struct ide_port_info cmd64x_chipsets[] = {
331 { /* 0: CMD643 */ 331 { /* 0: CMD643 */
332 .name = DRV_NAME, 332 .name = DRV_NAME,
333 .init_chipset = init_chipset_cmd64x, 333 .init_chipset = init_chipset_cmd64x,
@@ -373,7 +373,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
373 } 373 }
374}; 374};
375 375
376static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 376static int cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
377{ 377{
378 struct ide_port_info d; 378 struct ide_port_info d;
379 u8 idx = id->driver_data; 379 u8 idx = id->driver_data;
diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
index 14447621e60b..6250aee30503 100644
--- a/drivers/ide/cs5520.c
+++ b/drivers/ide/cs5520.c
@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
94 .set_dma_mode = cs5520_set_dma_mode, 94 .set_dma_mode = cs5520_set_dma_mode,
95}; 95};
96 96
97static const struct ide_port_info cyrix_chipset __devinitconst = { 97static const struct ide_port_info cyrix_chipset = {
98 .name = DRV_NAME, 98 .name = DRV_NAME,
99 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } }, 99 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
100 .port_ops = &cs5520_port_ops, 100 .port_ops = &cs5520_port_ops,
@@ -108,7 +108,7 @@ static const struct ide_port_info cyrix_chipset __devinitconst = {
108 * work longhand. 108 * work longhand.
109 */ 109 */
110 110
111static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id) 111static int cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
112{ 112{
113 const struct ide_port_info *d = &cyrix_chipset; 113 const struct ide_port_info *d = &cyrix_chipset;
114 struct ide_hw hw[2], *hws[] = { NULL, NULL }; 114 struct ide_hw hw[2], *hws[] = { NULL, NULL };
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
index 49b40ad59d1a..65371599b976 100644
--- a/drivers/ide/cs5530.c
+++ b/drivers/ide/cs5530.c
@@ -226,7 +226,7 @@ out:
226 * performs channel-specific pre-initialization before drive probing. 226 * performs channel-specific pre-initialization before drive probing.
227 */ 227 */
228 228
229static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif) 229static void init_hwif_cs5530 (ide_hwif_t *hwif)
230{ 230{
231 unsigned long basereg; 231 unsigned long basereg;
232 u32 d0_timings; 232 u32 d0_timings;
@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
245 .udma_filter = cs5530_udma_filter, 245 .udma_filter = cs5530_udma_filter,
246}; 246};
247 247
248static const struct ide_port_info cs5530_chipset __devinitconst = { 248static const struct ide_port_info cs5530_chipset = {
249 .name = DRV_NAME, 249 .name = DRV_NAME,
250 .init_chipset = init_chipset_cs5530, 250 .init_chipset = init_chipset_cs5530,
251 .init_hwif = init_hwif_cs5530, 251 .init_hwif = init_hwif_cs5530,
@@ -257,7 +257,7 @@ static const struct ide_port_info cs5530_chipset __devinitconst = {
257 .udma_mask = ATA_UDMA2, 257 .udma_mask = ATA_UDMA2,
258}; 258};
259 259
260static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id) 260static int cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)
261{ 261{
262 return ide_pci_init_one(dev, &cs5530_chipset, NULL); 262 return ide_pci_init_one(dev, &cs5530_chipset, NULL);
263} 263}
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
index 18d4c852602b..3bc5b9a34013 100644
--- a/drivers/ide/cs5535.c
+++ b/drivers/ide/cs5535.c
@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
170 .cable_detect = cs5535_cable_detect, 170 .cable_detect = cs5535_cable_detect,
171}; 171};
172 172
173static const struct ide_port_info cs5535_chipset __devinitconst = { 173static const struct ide_port_info cs5535_chipset = {
174 .name = DRV_NAME, 174 .name = DRV_NAME,
175 .port_ops = &cs5535_port_ops, 175 .port_ops = &cs5535_port_ops,
176 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE, 176 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
@@ -179,8 +179,7 @@ static const struct ide_port_info cs5535_chipset __devinitconst = {
179 .udma_mask = ATA_UDMA4, 179 .udma_mask = ATA_UDMA4,
180}; 180};
181 181
182static int __devinit cs5535_init_one(struct pci_dev *dev, 182static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
183 const struct pci_device_id *id)
184{ 183{
185 return ide_pci_init_one(dev, &cs5535_chipset, NULL); 184 return ide_pci_init_one(dev, &cs5535_chipset, NULL);
186} 185}
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
index 3ffb49dab574..f5820079a286 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -145,7 +145,7 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
145 pci_dev_put(dev); 145 pci_dev_put(dev);
146} 146}
147 147
148static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) 148static void init_iops_cy82c693(ide_hwif_t *hwif)
149{ 149{
150 static ide_hwif_t *primary; 150 static ide_hwif_t *primary;
151 struct pci_dev *dev = to_pci_dev(hwif->dev); 151 struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
163 .set_dma_mode = cy82c693_set_dma_mode, 163 .set_dma_mode = cy82c693_set_dma_mode,
164}; 164};
165 165
166static const struct ide_port_info cy82c693_chipset __devinitconst = { 166static const struct ide_port_info cy82c693_chipset = {
167 .name = DRV_NAME, 167 .name = DRV_NAME,
168 .init_iops = init_iops_cy82c693, 168 .init_iops = init_iops_cy82c693,
169 .port_ops = &cy82c693_port_ops, 169 .port_ops = &cy82c693_port_ops,
@@ -173,7 +173,8 @@ static const struct ide_port_info cy82c693_chipset __devinitconst = {
173 .mwdma_mask = ATA_MWDMA2, 173 .mwdma_mask = ATA_MWDMA2,
174}; 174};
175 175
176static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id) 176static int cy82c693_init_one(struct pci_dev *dev,
177 const struct pci_device_id *id)
177{ 178{
178 struct pci_dev *dev2; 179 struct pci_dev *dev2;
179 int ret = -ENODEV; 180 int ret = -ENODEV;
@@ -190,7 +191,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
190 return ret; 191 return ret;
191} 192}
192 193
193static void __devexit cy82c693_remove(struct pci_dev *dev) 194static void cy82c693_remove(struct pci_dev *dev)
194{ 195{
195 struct ide_host *host = pci_get_drvdata(dev); 196 struct ide_host *host = pci_get_drvdata(dev);
196 struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL; 197 struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL;
@@ -209,7 +210,7 @@ static struct pci_driver cy82c693_pci_driver = {
209 .name = "Cypress_IDE", 210 .name = "Cypress_IDE",
210 .id_table = cy82c693_pci_tbl, 211 .id_table = cy82c693_pci_tbl,
211 .probe = cy82c693_init_one, 212 .probe = cy82c693_init_one,
212 .remove = __devexit_p(cy82c693_remove), 213 .remove = cy82c693_remove,
213 .suspend = ide_pci_suspend, 214 .suspend = ide_pci_suspend,
214 .resume = ide_pci_resume, 215 .resume = ide_pci_resume,
215}; 216};
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c
index 1e10eba62ceb..7e27d3295e55 100644
--- a/drivers/ide/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
@@ -71,8 +71,7 @@ static const struct ide_port_info delkin_cb_port_info = {
71 .chipset = ide_pci, 71 .chipset = ide_pci,
72}; 72};
73 73
74static int __devinit 74static int delkin_cb_probe(struct pci_dev *dev, const struct pci_device_id *id)
75delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
76{ 75{
77 struct ide_host *host; 76 struct ide_host *host;
78 unsigned long base; 77 unsigned long base;
@@ -158,7 +157,7 @@ static int delkin_cb_resume(struct pci_dev *dev)
158#define delkin_cb_resume NULL 157#define delkin_cb_resume NULL
159#endif 158#endif
160 159
161static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = { 160static struct pci_device_id delkin_cb_pci_tbl[] = {
162 { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 161 { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
163 { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 162 { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
164 { 0, }, 163 { 0, },
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 4aec3b87ff91..696b6c1ec940 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
443 } 443 }
444}; 444};
445 445
446static const struct hpt_info hpt36x __devinitconst = { 446static const struct hpt_info hpt36x = {
447 .chip_name = "HPT36x", 447 .chip_name = "HPT36x",
448 .chip_type = HPT36x, 448 .chip_type = HPT36x,
449 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2, 449 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitconst = {
451 .timings = &hpt36x_timings 451 .timings = &hpt36x_timings
452}; 452};
453 453
454static const struct hpt_info hpt370 __devinitconst = { 454static const struct hpt_info hpt370 = {
455 .chip_name = "HPT370", 455 .chip_name = "HPT370",
456 .chip_type = HPT370, 456 .chip_type = HPT370,
457 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, 457 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitconst = {
459 .timings = &hpt37x_timings 459 .timings = &hpt37x_timings
460}; 460};
461 461
462static const struct hpt_info hpt370a __devinitconst = { 462static const struct hpt_info hpt370a = {
463 .chip_name = "HPT370A", 463 .chip_name = "HPT370A",
464 .chip_type = HPT370A, 464 .chip_type = HPT370A,
465 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, 465 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitconst = {
467 .timings = &hpt37x_timings 467 .timings = &hpt37x_timings
468}; 468};
469 469
470static const struct hpt_info hpt374 __devinitconst = { 470static const struct hpt_info hpt374 = {
471 .chip_name = "HPT374", 471 .chip_name = "HPT374",
472 .chip_type = HPT374, 472 .chip_type = HPT374,
473 .udma_mask = ATA_UDMA5, 473 .udma_mask = ATA_UDMA5,
@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitconst = {
475 .timings = &hpt37x_timings 475 .timings = &hpt37x_timings
476}; 476};
477 477
478static const struct hpt_info hpt372 __devinitconst = { 478static const struct hpt_info hpt372 = {
479 .chip_name = "HPT372", 479 .chip_name = "HPT372",
480 .chip_type = HPT372, 480 .chip_type = HPT372,
481 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 481 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitconst = {
483 .timings = &hpt37x_timings 483 .timings = &hpt37x_timings
484}; 484};
485 485
486static const struct hpt_info hpt372a __devinitconst = { 486static const struct hpt_info hpt372a = {
487 .chip_name = "HPT372A", 487 .chip_name = "HPT372A",
488 .chip_type = HPT372A, 488 .chip_type = HPT372A,
489 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 489 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitconst = {
491 .timings = &hpt37x_timings 491 .timings = &hpt37x_timings
492}; 492};
493 493
494static const struct hpt_info hpt302 __devinitconst = { 494static const struct hpt_info hpt302 = {
495 .chip_name = "HPT302", 495 .chip_name = "HPT302",
496 .chip_type = HPT302, 496 .chip_type = HPT302,
497 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 497 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitconst = {
499 .timings = &hpt37x_timings 499 .timings = &hpt37x_timings
500}; 500};
501 501
502static const struct hpt_info hpt371 __devinitconst = { 502static const struct hpt_info hpt371 = {
503 .chip_name = "HPT371", 503 .chip_name = "HPT371",
504 .chip_type = HPT371, 504 .chip_type = HPT371,
505 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 505 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitconst = {
507 .timings = &hpt37x_timings 507 .timings = &hpt37x_timings
508}; 508};
509 509
510static const struct hpt_info hpt372n __devinitconst = { 510static const struct hpt_info hpt372n = {
511 .chip_name = "HPT372N", 511 .chip_name = "HPT372N",
512 .chip_type = HPT372N, 512 .chip_type = HPT372N,
513 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 513 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitconst = {
515 .timings = &hpt37x_timings 515 .timings = &hpt37x_timings
516}; 516};
517 517
518static const struct hpt_info hpt302n __devinitconst = { 518static const struct hpt_info hpt302n = {
519 .chip_name = "HPT302N", 519 .chip_name = "HPT302N",
520 .chip_type = HPT302N, 520 .chip_type = HPT302N,
521 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 521 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitconst = {
523 .timings = &hpt37x_timings 523 .timings = &hpt37x_timings
524}; 524};
525 525
526static const struct hpt_info hpt371n __devinitconst = { 526static const struct hpt_info hpt371n = {
527 .chip_name = "HPT371N", 527 .chip_name = "HPT371N",
528 .chip_type = HPT371N, 528 .chip_type = HPT371N,
529 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, 529 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -1197,7 +1197,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
1197 return (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; 1197 return (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
1198} 1198}
1199 1199
1200static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) 1200static void init_hwif_hpt366(ide_hwif_t *hwif)
1201{ 1201{
1202 struct hpt_info *info = hpt3xx_get_info(hwif->dev); 1202 struct hpt_info *info = hpt3xx_get_info(hwif->dev);
1203 u8 chip_type = info->chip_type; 1203 u8 chip_type = info->chip_type;
@@ -1221,7 +1221,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
1221 } 1221 }
1222} 1222}
1223 1223
1224static int __devinit init_dma_hpt366(ide_hwif_t *hwif, 1224static int init_dma_hpt366(ide_hwif_t *hwif,
1225 const struct ide_port_info *d) 1225 const struct ide_port_info *d)
1226{ 1226{
1227 struct pci_dev *dev = to_pci_dev(hwif->dev); 1227 struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -1265,7 +1265,7 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif,
1265 return 0; 1265 return 0;
1266} 1266}
1267 1267
1268static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) 1268static void hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
1269{ 1269{
1270 if (dev2->irq != dev->irq) { 1270 if (dev2->irq != dev->irq) {
1271 /* FIXME: we need a core pci_set_interrupt() */ 1271 /* FIXME: we need a core pci_set_interrupt() */
@@ -1275,7 +1275,7 @@ static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
1275 } 1275 }
1276} 1276}
1277 1277
1278static void __devinit hpt371_init(struct pci_dev *dev) 1278static void hpt371_init(struct pci_dev *dev)
1279{ 1279{
1280 u8 mcr1 = 0; 1280 u8 mcr1 = 0;
1281 1281
@@ -1290,7 +1290,7 @@ static void __devinit hpt371_init(struct pci_dev *dev)
1290 pci_write_config_byte(dev, 0x50, mcr1 & ~0x04); 1290 pci_write_config_byte(dev, 0x50, mcr1 & ~0x04);
1291} 1291}
1292 1292
1293static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2) 1293static int hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
1294{ 1294{
1295 u8 mcr1 = 0, pin1 = 0, pin2 = 0; 1295 u8 mcr1 = 0, pin1 = 0, pin2 = 0;
1296 1296
@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
1361 .dma_sff_read_status = ide_dma_sff_read_status, 1361 .dma_sff_read_status = ide_dma_sff_read_status,
1362}; 1362};
1363 1363
1364static const struct ide_port_info hpt366_chipsets[] __devinitconst = { 1364static const struct ide_port_info hpt366_chipsets[] = {
1365 { /* 0: HPT36x */ 1365 { /* 0: HPT36x */
1366 .name = DRV_NAME, 1366 .name = DRV_NAME,
1367 .init_chipset = init_chipset_hpt366, 1367 .init_chipset = init_chipset_hpt366,
@@ -1402,7 +1402,7 @@ static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
1402 * Called when the PCI registration layer (or the IDE initialization) 1402 * Called when the PCI registration layer (or the IDE initialization)
1403 * finds a device matching our IDE device tables. 1403 * finds a device matching our IDE device tables.
1404 */ 1404 */
1405static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_device_id *id) 1405static int hpt366_init_one(struct pci_dev *dev, const struct pci_device_id *id)
1406{ 1406{
1407 const struct hpt_info *info = NULL; 1407 const struct hpt_info *info = NULL;
1408 struct hpt_info *dyn_info; 1408 struct hpt_info *dyn_info;
@@ -1499,7 +1499,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
1499 return ret; 1499 return ret;
1500} 1500}
1501 1501
1502static void __devexit hpt366_remove(struct pci_dev *dev) 1502static void hpt366_remove(struct pci_dev *dev)
1503{ 1503{
1504 struct ide_host *host = pci_get_drvdata(dev); 1504 struct ide_host *host = pci_get_drvdata(dev);
1505 struct ide_info *info = host->host_priv; 1505 struct ide_info *info = host->host_priv;
@@ -1510,7 +1510,7 @@ static void __devexit hpt366_remove(struct pci_dev *dev)
1510 kfree(info); 1510 kfree(info);
1511} 1511}
1512 1512
1513static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = { 1513static const struct pci_device_id hpt366_pci_tbl[] = {
1514 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 }, 1514 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 },
1515 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 }, 1515 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 },
1516 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 }, 1516 { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 },
@@ -1525,7 +1525,7 @@ static struct pci_driver hpt366_pci_driver = {
1525 .name = "HPT366_IDE", 1525 .name = "HPT366_IDE",
1526 .id_table = hpt366_pci_tbl, 1526 .id_table = hpt366_pci_tbl,
1527 .probe = hpt366_init_one, 1527 .probe = hpt366_init_one,
1528 .remove = __devexit_p(hpt366_remove), 1528 .remove = hpt366_remove,
1529 .suspend = ide_pci_suspend, 1529 .suspend = ide_pci_suspend,
1530 .resume = ide_pci_resume, 1530 .resume = ide_pci_resume,
1531}; 1531};
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index e640d0ac3af6..9f0a48e39b8a 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -406,8 +406,8 @@ static const struct ide_port_info icside_v5_port_info = {
406 .chipset = ide_acorn, 406 .chipset = ide_acorn,
407}; 407};
408 408
409static int __devinit 409static int icside_register_v5(struct icside_state *state,
410icside_register_v5(struct icside_state *state, struct expansion_card *ec) 410 struct expansion_card *ec)
411{ 411{
412 void __iomem *base; 412 void __iomem *base;
413 struct ide_host *host; 413 struct ide_host *host;
@@ -460,8 +460,8 @@ static const struct ide_port_info icside_v6_port_info __initconst = {
460 .chipset = ide_acorn, 460 .chipset = ide_acorn,
461}; 461};
462 462
463static int __devinit 463static int icside_register_v6(struct icside_state *state,
464icside_register_v6(struct icside_state *state, struct expansion_card *ec) 464 struct expansion_card *ec)
465{ 465{
466 void __iomem *ioc_base, *easi_base; 466 void __iomem *ioc_base, *easi_base;
467 struct ide_host *host; 467 struct ide_host *host;
@@ -537,8 +537,7 @@ out:
537 return ret; 537 return ret;
538} 538}
539 539
540static int __devinit 540static int icside_probe(struct expansion_card *ec, const struct ecard_id *id)
541icside_probe(struct expansion_card *ec, const struct ecard_id *id)
542{ 541{
543 struct icside_state *state; 542 struct icside_state *state;
544 void __iomem *idmem; 543 void __iomem *idmem;
@@ -604,7 +603,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
604 return ret; 603 return ret;
605} 604}
606 605
607static void __devexit icside_remove(struct expansion_card *ec) 606static void icside_remove(struct expansion_card *ec)
608{ 607{
609 struct icside_state *state = ecard_get_drvdata(ec); 608 struct icside_state *state = ecard_get_drvdata(ec);
610 609
@@ -666,7 +665,7 @@ static const struct ecard_id icside_ids[] = {
666 665
667static struct ecard_driver icside_driver = { 666static struct ecard_driver icside_driver = {
668 .probe = icside_probe, 667 .probe = icside_probe,
669 .remove = __devexit_p(icside_remove), 668 .remove = icside_remove,
670 .shutdown = icside_shutdown, 669 .shutdown = icside_shutdown,
671 .id_table = icside_ids, 670 .id_table = icside_ids,
672 .drv = { 671 .drv = {
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index dab5b670bfbf..673420db953f 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
53 .udma_mask = ATA_UDMA6, \ 53 .udma_mask = ATA_UDMA6, \
54 } 54 }
55 55
56static const struct ide_port_info generic_chipsets[] __devinitconst = { 56static const struct ide_port_info generic_chipsets[] = {
57 /* 0: Unknown */ 57 /* 0: Unknown */
58 DECLARE_GENERIC_PCI_DEV(0), 58 DECLARE_GENERIC_PCI_DEV(0),
59 59
@@ -103,7 +103,7 @@ static const struct ide_port_info generic_chipsets[] __devinitconst = {
103 * finds a device matching our IDE device tables. 103 * finds a device matching our IDE device tables.
104 */ 104 */
105 105
106static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id) 106static int generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
107{ 107{
108 const struct ide_port_info *d = &generic_chipsets[id->driver_data]; 108 const struct ide_port_info *d = &generic_chipsets[id->driver_data];
109 int ret = -ENODEV; 109 int ret = -ENODEV;
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index 962693b10a1c..ba4bfbead24b 100644
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -22,11 +22,9 @@
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <linux/io.h> 23#include <linux/io.h>
24 24
25static void __devinit plat_ide_setup_ports(struct ide_hw *hw, 25static void plat_ide_setup_ports(struct ide_hw *hw, void __iomem *base,
26 void __iomem *base, 26 void __iomem *ctrl,
27 void __iomem *ctrl, 27 struct pata_platform_info *pdata, int irq)
28 struct pata_platform_info *pdata,
29 int irq)
30{ 28{
31 unsigned long port = (unsigned long)base; 29 unsigned long port = (unsigned long)base;
32 int i; 30 int i;
@@ -48,7 +46,7 @@ static const struct ide_port_info platform_ide_port_info = {
48 .chipset = ide_generic, 46 .chipset = ide_generic,
49}; 47};
50 48
51static int __devinit plat_ide_probe(struct platform_device *pdev) 49static int plat_ide_probe(struct platform_device *pdev)
52{ 50{
53 struct resource *res_base, *res_alt, *res_irq; 51 struct resource *res_base, *res_alt, *res_irq;
54 void __iomem *base, *alt_base; 52 void __iomem *base, *alt_base;
@@ -115,7 +113,7 @@ out:
115 return ret; 113 return ret;
116} 114}
117 115
118static int __devexit plat_ide_remove(struct platform_device *pdev) 116static int plat_ide_remove(struct platform_device *pdev)
119{ 117{
120 struct ide_host *host = dev_get_drvdata(&pdev->dev); 118 struct ide_host *host = dev_get_drvdata(&pdev->dev);
121 119
@@ -130,7 +128,7 @@ static struct platform_driver platform_ide_driver = {
130 .owner = THIS_MODULE, 128 .owner = THIS_MODULE,
131 }, 129 },
132 .probe = plat_ide_probe, 130 .probe = plat_ide_probe,
133 .remove = __devexit_p(plat_ide_remove), 131 .remove = plat_ide_remove,
134}; 132};
135 133
136static int __init platform_ide_init(void) 134static int __init platform_ide_init(void)
diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
index d5dd180c4b85..b6f674ab4fb7 100644
--- a/drivers/ide/it8172.c
+++ b/drivers/ide/it8172.c
@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
115 .set_dma_mode = it8172_set_dma_mode, 115 .set_dma_mode = it8172_set_dma_mode,
116}; 116};
117 117
118static const struct ide_port_info it8172_port_info __devinitconst = { 118static const struct ide_port_info it8172_port_info = {
119 .name = DRV_NAME, 119 .name = DRV_NAME,
120 .port_ops = &it8172_port_ops, 120 .port_ops = &it8172_port_ops,
121 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} }, 121 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
@@ -125,8 +125,7 @@ static const struct ide_port_info it8172_port_info __devinitconst = {
125 .udma_mask = ATA_UDMA2, 125 .udma_mask = ATA_UDMA2,
126}; 126};
127 127
128static int __devinit it8172_init_one(struct pci_dev *dev, 128static int it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
129 const struct pci_device_id *id)
130{ 129{
131 if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) 130 if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
132 return -ENODEV; /* IT8172 is more than an IDE controller */ 131 return -ENODEV; /* IT8172 is more than an IDE controller */
diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
index 1847aeb5450a..6b92846682fc 100644
--- a/drivers/ide/it8213.c
+++ b/drivers/ide/it8213.c
@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
156 .cable_detect = it8213_cable_detect, 156 .cable_detect = it8213_cable_detect,
157}; 157};
158 158
159static const struct ide_port_info it8213_chipset __devinitconst = { 159static const struct ide_port_info it8213_chipset = {
160 .name = DRV_NAME, 160 .name = DRV_NAME,
161 .enablebits = { {0x41, 0x80, 0x80} }, 161 .enablebits = { {0x41, 0x80, 0x80} },
162 .port_ops = &it8213_port_ops, 162 .port_ops = &it8213_port_ops,
@@ -177,7 +177,7 @@ static const struct ide_port_info it8213_chipset __devinitconst = {
177 * standard helper functions to do almost all the work for us. 177 * standard helper functions to do almost all the work for us.
178 */ 178 */
179 179
180static int __devinit it8213_init_one(struct pci_dev *dev, const struct pci_device_id *id) 180static int it8213_init_one(struct pci_dev *dev, const struct pci_device_id *id)
181{ 181{
182 return ide_pci_init_one(dev, &it8213_chipset, NULL); 182 return ide_pci_init_one(dev, &it8213_chipset, NULL);
183} 183}
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index c5611dbca342..f01ba4606be0 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -528,7 +528,7 @@ static struct ide_dma_ops it821x_pass_through_dma_ops = {
528 * ide DMA handlers appropriately 528 * ide DMA handlers appropriately
529 */ 529 */
530 530
531static void __devinit init_hwif_it821x(ide_hwif_t *hwif) 531static void init_hwif_it821x(ide_hwif_t *hwif)
532{ 532{
533 struct pci_dev *dev = to_pci_dev(hwif->dev); 533 struct pci_dev *dev = to_pci_dev(hwif->dev);
534 struct ide_host *host = pci_get_drvdata(dev); 534 struct ide_host *host = pci_get_drvdata(dev);
@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
630 .cable_detect = it821x_cable_detect, 630 .cable_detect = it821x_cable_detect,
631}; 631};
632 632
633static const struct ide_port_info it821x_chipset __devinitconst = { 633static const struct ide_port_info it821x_chipset = {
634 .name = DRV_NAME, 634 .name = DRV_NAME,
635 .init_chipset = init_chipset_it821x, 635 .init_chipset = init_chipset_it821x,
636 .init_hwif = init_hwif_it821x, 636 .init_hwif = init_hwif_it821x,
@@ -647,7 +647,7 @@ static const struct ide_port_info it821x_chipset __devinitconst = {
647 * We then use the IDE PCI generic helper to do most of the work. 647 * We then use the IDE PCI generic helper to do most of the work.
648 */ 648 */
649 649
650static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 650static int it821x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
651{ 651{
652 struct it821x_dev *itdevs; 652 struct it821x_dev *itdevs;
653 int rc; 653 int rc;
@@ -667,7 +667,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
667 return rc; 667 return rc;
668} 668}
669 669
670static void __devexit it821x_remove(struct pci_dev *dev) 670static void it821x_remove(struct pci_dev *dev)
671{ 671{
672 struct ide_host *host = pci_get_drvdata(dev); 672 struct ide_host *host = pci_get_drvdata(dev);
673 struct it821x_dev *itdevs = host->host_priv; 673 struct it821x_dev *itdevs = host->host_priv;
@@ -689,7 +689,7 @@ static struct pci_driver it821x_pci_driver = {
689 .name = "ITE821x IDE", 689 .name = "ITE821x IDE",
690 .id_table = it821x_pci_tbl, 690 .id_table = it821x_pci_tbl,
691 .probe = it821x_init_one, 691 .probe = it821x_init_one,
692 .remove = __devexit_p(it821x_remove), 692 .remove = it821x_remove,
693 .suspend = ide_pci_suspend, 693 .suspend = ide_pci_suspend,
694 .resume = ide_pci_resume, 694 .resume = ide_pci_resume,
695}; 695};
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index efddd7d9f92d..ae6480dcbadf 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
102 .cable_detect = jmicron_cable_detect, 102 .cable_detect = jmicron_cable_detect,
103}; 103};
104 104
105static const struct ide_port_info jmicron_chipset __devinitconst = { 105static const struct ide_port_info jmicron_chipset = {
106 .name = DRV_NAME, 106 .name = DRV_NAME,
107 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, 107 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
108 .port_ops = &jmicron_port_ops, 108 .port_ops = &jmicron_port_ops,
@@ -120,7 +120,7 @@ static const struct ide_port_info jmicron_chipset __devinitconst = {
120 * We then use the IDE PCI generic helper to do most of the work. 120 * We then use the IDE PCI generic helper to do most of the work.
121 */ 121 */
122 122
123static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id) 123static int jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id)
124{ 124{
125 return ide_pci_init_one(dev, &jmicron_chipset, NULL); 125 return ide_pci_init_one(dev, &jmicron_chipset, NULL);
126} 126}
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 73f78d872d55..392fd106edf1 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -96,7 +96,7 @@ static const struct ide_tp_ops superio_tp_ops = {
96 .output_data = ide_output_data, 96 .output_data = ide_output_data,
97}; 97};
98 98
99static void __devinit superio_init_iops(struct hwif_s *hwif) 99static void superio_init_iops(struct hwif_s *hwif)
100{ 100{
101 struct pci_dev *pdev = to_pci_dev(hwif->dev); 101 struct pci_dev *pdev = to_pci_dev(hwif->dev);
102 u32 dma_stat; 102 u32 dma_stat;
@@ -201,7 +201,7 @@ static int ns87415_dma_end(ide_drive_t *drive)
201 return (dma_stat & 7) != 4; 201 return (dma_stat & 7) != 4;
202} 202}
203 203
204static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) 204static void init_hwif_ns87415 (ide_hwif_t *hwif)
205{ 205{
206 struct pci_dev *dev = to_pci_dev(hwif->dev); 206 struct pci_dev *dev = to_pci_dev(hwif->dev);
207 unsigned int ctrl, using_inta; 207 unsigned int ctrl, using_inta;
@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
293 .dma_sff_read_status = superio_dma_sff_read_status, 293 .dma_sff_read_status = superio_dma_sff_read_status,
294}; 294};
295 295
296static const struct ide_port_info ns87415_chipset __devinitconst = { 296static const struct ide_port_info ns87415_chipset = {
297 .name = DRV_NAME, 297 .name = DRV_NAME,
298 .init_hwif = init_hwif_ns87415, 298 .init_hwif = init_hwif_ns87415,
299 .tp_ops = &ns87415_tp_ops, 299 .tp_ops = &ns87415_tp_ops,
@@ -302,7 +302,7 @@ static const struct ide_port_info ns87415_chipset __devinitconst = {
302 IDE_HFLAG_NO_ATAPI_DMA, 302 IDE_HFLAG_NO_ATAPI_DMA,
303}; 303};
304 304
305static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id) 305static int ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
306{ 306{
307 struct ide_port_info d = ns87415_chipset; 307 struct ide_port_info d = ns87415_chipset;
308 308
diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
index 39edc66cb96c..26a45007e535 100644
--- a/drivers/ide/opti621.c
+++ b/drivers/ide/opti621.c
@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
131 .set_pio_mode = opti621_set_pio_mode, 131 .set_pio_mode = opti621_set_pio_mode,
132}; 132};
133 133
134static const struct ide_port_info opti621_chipset __devinitconst = { 134static const struct ide_port_info opti621_chipset = {
135 .name = DRV_NAME, 135 .name = DRV_NAME,
136 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, 136 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
137 .port_ops = &opti621_port_ops, 137 .port_ops = &opti621_port_ops,
@@ -139,7 +139,7 @@ static const struct ide_port_info opti621_chipset __devinitconst = {
139 .pio_mask = ATA_PIO4, 139 .pio_mask = ATA_PIO4,
140}; 140};
141 141
142static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id) 142static int opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
143{ 143{
144 return ide_pci_init_one(dev, &opti621_chipset, NULL); 144 return ide_pci_init_one(dev, &opti621_chipset, NULL);
145} 145}
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 712c7904d03e..6107cc4ee012 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -220,7 +220,7 @@ static void palm_bk3710_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
220 palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio); 220 palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio);
221} 221}
222 222
223static void __devinit palm_bk3710_chipinit(void __iomem *base) 223static void palm_bk3710_chipinit(void __iomem *base)
224{ 224{
225 /* 225 /*
226 * REVISIT: the ATA reset signal needs to be managed through a 226 * REVISIT: the ATA reset signal needs to be managed through a
@@ -282,8 +282,7 @@ static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif)
282 return ATA_CBL_PATA80; 282 return ATA_CBL_PATA80;
283} 283}
284 284
285static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif, 285static int palm_bk3710_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
286 const struct ide_port_info *d)
287{ 286{
288 printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); 287 printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
289 288
@@ -301,7 +300,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = {
301 .cable_detect = palm_bk3710_cable_detect, 300 .cable_detect = palm_bk3710_cable_detect,
302}; 301};
303 302
304static struct ide_port_info __devinitdata palm_bk3710_port_info = { 303static struct ide_port_info palm_bk3710_port_info = {
305 .init_dma = palm_bk3710_init_dma, 304 .init_dma = palm_bk3710_init_dma,
306 .port_ops = &palm_bk3710_ports_ops, 305 .port_ops = &palm_bk3710_ports_ops,
307 .dma_ops = &sff_dma_ops, 306 .dma_ops = &sff_dma_ops,
diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
index 2e5ceb62fb3b..df73cbd9387e 100644
--- a/drivers/ide/pdc202xx_new.c
+++ b/drivers/ide/pdc202xx_new.c
@@ -422,7 +422,7 @@ static int init_chipset_pdcnew(struct pci_dev *dev)
422 return 0; 422 return 0;
423} 423}
424 424
425static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev) 425static struct pci_dev *pdc20270_get_dev2(struct pci_dev *dev)
426{ 426{
427 struct pci_dev *dev2; 427 struct pci_dev *dev2;
428 428
@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
465 .udma_mask = udma, \ 465 .udma_mask = udma, \
466 } 466 }
467 467
468static const struct ide_port_info pdcnew_chipsets[] __devinitconst = { 468static const struct ide_port_info pdcnew_chipsets[] = {
469 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5), 469 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
470 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6), 470 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
471}; 471};
@@ -479,7 +479,7 @@ static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
479 * finds a device matching our IDE device tables. 479 * finds a device matching our IDE device tables.
480 */ 480 */
481 481
482static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id) 482static int pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id)
483{ 483{
484 const struct ide_port_info *d = &pdcnew_chipsets[id->driver_data]; 484 const struct ide_port_info *d = &pdcnew_chipsets[id->driver_data];
485 struct pci_dev *bridge = dev->bus->self; 485 struct pci_dev *bridge = dev->bus->self;
@@ -514,7 +514,7 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
514 return ide_pci_init_one(dev, d, NULL); 514 return ide_pci_init_one(dev, d, NULL);
515} 515}
516 516
517static void __devexit pdc202new_remove(struct pci_dev *dev) 517static void pdc202new_remove(struct pci_dev *dev)
518{ 518{
519 struct ide_host *host = pci_get_drvdata(dev); 519 struct ide_host *host = pci_get_drvdata(dev);
520 struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL; 520 struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL;
@@ -539,7 +539,7 @@ static struct pci_driver pdc202new_pci_driver = {
539 .name = "Promise_IDE", 539 .name = "Promise_IDE",
540 .id_table = pdc202new_pci_tbl, 540 .id_table = pdc202new_pci_tbl,
541 .probe = pdc202new_init_one, 541 .probe = pdc202new_init_one,
542 .remove = __devexit_p(pdc202new_remove), 542 .remove = pdc202new_remove,
543 .suspend = ide_pci_suspend, 543 .suspend = ide_pci_suspend,
544 .resume = ide_pci_resume, 544 .resume = ide_pci_resume,
545}; 545};
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
index 563451096812..224ad46d6cb2 100644
--- a/drivers/ide/pdc202xx_old.c
+++ b/drivers/ide/pdc202xx_old.c
@@ -211,8 +211,7 @@ out:
211 return 0; 211 return 0;
212} 212}
213 213
214static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, 214static void pdc202ata4_fixup_irq(struct pci_dev *dev, const char *name)
215 const char *name)
216{ 215{
217 if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) { 216 if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) {
218 u8 irq = 0, irq2 = 0; 217 u8 irq = 0, irq2 = 0;
@@ -270,7 +269,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
270 .max_sectors = sectors, \ 269 .max_sectors = sectors, \
271 } 270 }
272 271
273static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = { 272static const struct ide_port_info pdc202xx_chipsets[] = {
274 { /* 0: PDC20246 */ 273 { /* 0: PDC20246 */
275 .name = DRV_NAME, 274 .name = DRV_NAME,
276 .init_chipset = init_chipset_pdc202xx, 275 .init_chipset = init_chipset_pdc202xx,
@@ -297,7 +296,8 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
297 * finds a device matching our IDE device tables. 296 * finds a device matching our IDE device tables.
298 */ 297 */
299 298
300static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id) 299static int pdc202xx_init_one(struct pci_dev *dev,
300 const struct pci_device_id *id)
301{ 301{
302 const struct ide_port_info *d; 302 const struct ide_port_info *d;
303 u8 idx = id->driver_data; 303 u8 idx = id->driver_data;
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index fe0fd60cfc09..a671cead6ae7 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -297,7 +297,7 @@ static u8 piix_cable_detect(ide_hwif_t *hwif)
297 * capabilities of the hardware. 297 * capabilities of the hardware.
298 */ 298 */
299 299
300static void __devinit init_hwif_piix(ide_hwif_t *hwif) 300static void init_hwif_piix(ide_hwif_t *hwif)
301{ 301{
302 if (!hwif->dma_base) 302 if (!hwif->dma_base)
303 return; 303 return;
@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
344 .udma_mask = udma, \ 344 .udma_mask = udma, \
345 } 345 }
346 346
347static const struct ide_port_info piix_pci_info[] __devinitconst = { 347static const struct ide_port_info piix_pci_info[] = {
348 /* 0: MPIIX */ 348 /* 0: MPIIX */
349 { /* 349 { /*
350 * MPIIX actually has only a single IDE channel mapped to 350 * MPIIX actually has only a single IDE channel mapped to
@@ -382,7 +382,7 @@ static const struct ide_port_info piix_pci_info[] __devinitconst = {
382 * finds a device matching our IDE device tables. 382 * finds a device matching our IDE device tables.
383 */ 383 */
384 384
385static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_id *id) 385static int piix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
386{ 386{
387 return ide_pci_init_one(dev, &piix_pci_info[id->driver_data], NULL); 387 return ide_pci_init_one(dev, &piix_pci_info[id->driver_data], NULL);
388} 388}
@@ -394,7 +394,7 @@ static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_
394 * they are found, disable use of DMA IDE 394 * they are found, disable use of DMA IDE
395 */ 395 */
396 396
397static void __devinit piix_check_450nx(void) 397static void piix_check_450nx(void)
398{ 398{
399 struct pci_dev *pdev = NULL; 399 struct pci_dev *pdev = NULL;
400 u16 cfg; 400 u16 cfg;
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index e944c7f705f7..bf83d7bb6bc6 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1025,8 +1025,7 @@ static const struct ide_port_info pmac_port_info = {
1025 * Setup, register & probe an IDE channel driven by this driver, this is 1025 * Setup, register & probe an IDE channel driven by this driver, this is
1026 * called by one of the 2 probe functions (macio or PCI). 1026 * called by one of the 2 probe functions (macio or PCI).
1027 */ 1027 */
1028static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, 1028static int pmac_ide_setup_device(pmac_ide_hwif_t *pmif, struct ide_hw *hw)
1029 struct ide_hw *hw)
1030{ 1029{
1031 struct device_node *np = pmif->node; 1030 struct device_node *np = pmif->node;
1032 const int *bidp; 1031 const int *bidp;
@@ -1126,7 +1125,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif,
1126 return rc; 1125 return rc;
1127} 1126}
1128 1127
1129static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) 1128static void pmac_ide_init_ports(struct ide_hw *hw, unsigned long base)
1130{ 1129{
1131 int i; 1130 int i;
1132 1131
@@ -1139,8 +1138,8 @@ static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base)
1139/* 1138/*
1140 * Attach to a macio probed interface 1139 * Attach to a macio probed interface
1141 */ 1140 */
1142static int __devinit 1141static int pmac_ide_macio_attach(struct macio_dev *mdev,
1143pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) 1142 const struct of_device_id *match)
1144{ 1143{
1145 void __iomem *base; 1144 void __iomem *base;
1146 unsigned long regbase; 1145 unsigned long regbase;
@@ -1262,8 +1261,8 @@ pmac_ide_macio_resume(struct macio_dev *mdev)
1262/* 1261/*
1263 * Attach to a PCI probed interface 1262 * Attach to a PCI probed interface
1264 */ 1263 */
1265static int __devinit 1264static int pmac_ide_pci_attach(struct pci_dev *pdev,
1266pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) 1265 const struct pci_device_id *id)
1267{ 1266{
1268 struct device_node *np; 1267 struct device_node *np;
1269 pmac_ide_hwif_t *pmif; 1268 pmac_ide_hwif_t *pmif;
@@ -1692,8 +1691,7 @@ static const struct ide_dma_ops pmac_dma_ops = {
1692 * Allocate the data structures needed for using DMA with an interface 1691 * Allocate the data structures needed for using DMA with an interface
1693 * and fill the proper list of functions pointers 1692 * and fill the proper list of functions pointers
1694 */ 1693 */
1695static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, 1694static int pmac_ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
1696 const struct ide_port_info *d)
1697{ 1695{
1698 pmac_ide_hwif_t *pmif = 1696 pmac_ide_hwif_t *pmif =
1699 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1697 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c
index 48d976aad7ab..d73c3d10087c 100644
--- a/drivers/ide/rapide.c
+++ b/drivers/ide/rapide.c
@@ -29,8 +29,7 @@ static void rapide_setup_ports(struct ide_hw *hw, void __iomem *base,
29 hw->irq = irq; 29 hw->irq = irq;
30} 30}
31 31
32static int __devinit 32static int rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
33rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
34{ 33{
35 void __iomem *base; 34 void __iomem *base;
36 struct ide_host *host; 35 struct ide_host *host;
@@ -64,7 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
64 return ret; 63 return ret;
65} 64}
66 65
67static void __devexit rapide_remove(struct expansion_card *ec) 66static void rapide_remove(struct expansion_card *ec)
68{ 67{
69 struct ide_host *host = ecard_get_drvdata(ec); 68 struct ide_host *host = ecard_get_drvdata(ec);
70 69
@@ -82,7 +81,7 @@ static struct ecard_id rapide_ids[] = {
82 81
83static struct ecard_driver rapide_driver = { 82static struct ecard_driver rapide_driver = {
84 .probe = rapide_probe, 83 .probe = rapide_probe,
85 .remove = __devexit_p(rapide_remove), 84 .remove = rapide_remove,
86 .id_table = rapide_ids, 85 .id_table = rapide_ids,
87 .drv = { 86 .drv = {
88 .name = "rapide", 87 .name = "rapide",
diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
index c04173e9fc38..f4b66f7ec9fd 100644
--- a/drivers/ide/rz1000.c
+++ b/drivers/ide/rz1000.c
@@ -22,7 +22,7 @@
22 22
23#define DRV_NAME "rz1000" 23#define DRV_NAME "rz1000"
24 24
25static int __devinit rz1000_disable_readahead(struct pci_dev *dev) 25static int rz1000_disable_readahead(struct pci_dev *dev)
26{ 26{
27 u16 reg; 27 u16 reg;
28 28
@@ -38,12 +38,12 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
38 } 38 }
39} 39}
40 40
41static const struct ide_port_info rz1000_chipset __devinitconst = { 41static const struct ide_port_info rz1000_chipset = {
42 .name = DRV_NAME, 42 .name = DRV_NAME,
43 .host_flags = IDE_HFLAG_NO_DMA, 43 .host_flags = IDE_HFLAG_NO_DMA,
44}; 44};
45 45
46static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id) 46static int rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
47{ 47{
48 struct ide_port_info d = rz1000_chipset; 48 struct ide_port_info d = rz1000_chipset;
49 int rc; 49 int rc;
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index d4758ebe77da..a5b701818405 100644
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
291 .dma_sff_read_status = ide_dma_sff_read_status, 291 .dma_sff_read_status = ide_dma_sff_read_status,
292}; 292};
293 293
294static const struct ide_port_info sc1200_chipset __devinitconst = { 294static const struct ide_port_info sc1200_chipset = {
295 .name = DRV_NAME, 295 .name = DRV_NAME,
296 .port_ops = &sc1200_port_ops, 296 .port_ops = &sc1200_port_ops,
297 .dma_ops = &sc1200_dma_ops, 297 .dma_ops = &sc1200_dma_ops,
@@ -303,7 +303,7 @@ static const struct ide_port_info sc1200_chipset __devinitconst = {
303 .udma_mask = ATA_UDMA2, 303 .udma_mask = ATA_UDMA2,
304}; 304};
305 305
306static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) 306static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
307{ 307{
308 struct sc1200_saved_state *ss = NULL; 308 struct sc1200_saved_state *ss = NULL;
309 int rc; 309 int rc;
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 970103810021..2a2d188b5d5b 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -585,8 +585,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
585 * Perform the initial set up for this device. 585 * Perform the initial set up for this device.
586 */ 586 */
587 587
588static int __devinit init_setup_scc(struct pci_dev *dev, 588static int init_setup_scc(struct pci_dev *dev, const struct ide_port_info *d)
589 const struct ide_port_info *d)
590{ 589{
591 unsigned long ctl_base; 590 unsigned long ctl_base;
592 unsigned long dma_base; 591 unsigned long dma_base;
@@ -718,7 +717,7 @@ static void scc_output_data(ide_drive_t *drive, struct ide_cmd *cmd,
718 * 717 *
719 */ 718 */
720 719
721static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) 720static void init_mmio_iops_scc(ide_hwif_t *hwif)
722{ 721{
723 struct pci_dev *dev = to_pci_dev(hwif->dev); 722 struct pci_dev *dev = to_pci_dev(hwif->dev);
724 struct scc_ports *ports = pci_get_drvdata(dev); 723 struct scc_ports *ports = pci_get_drvdata(dev);
@@ -738,7 +737,7 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
738 * and then do the MMIO setup. 737 * and then do the MMIO setup.
739 */ 738 */
740 739
741static void __devinit init_iops_scc(ide_hwif_t *hwif) 740static void init_iops_scc(ide_hwif_t *hwif)
742{ 741{
743 struct pci_dev *dev = to_pci_dev(hwif->dev); 742 struct pci_dev *dev = to_pci_dev(hwif->dev);
744 743
@@ -748,8 +747,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
748 init_mmio_iops_scc(hwif); 747 init_mmio_iops_scc(hwif);
749} 748}
750 749
751static int __devinit scc_init_dma(ide_hwif_t *hwif, 750static int scc_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
752 const struct ide_port_info *d)
753{ 751{
754 return ide_allocate_dma_engine(hwif); 752 return ide_allocate_dma_engine(hwif);
755} 753}
@@ -768,7 +766,7 @@ static u8 scc_cable_detect(ide_hwif_t *hwif)
768 * ide DMA handlers appropriately. 766 * ide DMA handlers appropriately.
769 */ 767 */
770 768
771static void __devinit init_hwif_scc(ide_hwif_t *hwif) 769static void init_hwif_scc(ide_hwif_t *hwif)
772{ 770{
773 /* PTERADD */ 771 /* PTERADD */
774 out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma); 772 out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma);
@@ -811,7 +809,7 @@ static const struct ide_dma_ops scc_dma_ops = {
811 .dma_sff_read_status = scc_dma_sff_read_status, 809 .dma_sff_read_status = scc_dma_sff_read_status,
812}; 810};
813 811
814static const struct ide_port_info scc_chipset __devinitconst = { 812static const struct ide_port_info scc_chipset = {
815 .name = "sccIDE", 813 .name = "sccIDE",
816 .init_iops = init_iops_scc, 814 .init_iops = init_iops_scc,
817 .init_dma = scc_init_dma, 815 .init_dma = scc_init_dma,
@@ -834,7 +832,7 @@ static const struct ide_port_info scc_chipset __devinitconst = {
834 * We then use the IDE PCI generic helper to do most of the work. 832 * We then use the IDE PCI generic helper to do most of the work.
835 */ 833 */
836 834
837static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id) 835static int scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
838{ 836{
839 return init_setup_scc(dev, &scc_chipset); 837 return init_setup_scc(dev, &scc_chipset);
840} 838}
@@ -846,7 +844,7 @@ static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_i
846 * Called by the PCI code when it removes an SCC PATA controller. 844 * Called by the PCI code when it removes an SCC PATA controller.
847 */ 845 */
848 846
849static void __devexit scc_remove(struct pci_dev *dev) 847static void scc_remove(struct pci_dev *dev)
850{ 848{
851 struct scc_ports *ports = pci_get_drvdata(dev); 849 struct scc_ports *ports = pci_get_drvdata(dev);
852 struct ide_host *host = ports->host; 850 struct ide_host *host = ports->host;
@@ -869,7 +867,7 @@ static struct pci_driver scc_pci_driver = {
869 .name = "SCC IDE", 867 .name = "SCC IDE",
870 .id_table = scc_pci_tbl, 868 .id_table = scc_pci_tbl,
871 .probe = scc_init_one, 869 .probe = scc_init_one,
872 .remove = __devexit_p(scc_remove), 870 .remove = scc_remove,
873}; 871};
874 872
875static int __init scc_ide_init(void) 873static int __init scc_ide_init(void)
diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
index 24d72ef23df7..a97affca18ab 100644
--- a/drivers/ide/serverworks.c
+++ b/drivers/ide/serverworks.c
@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
337 .cable_detect = svwks_cable_detect, 337 .cable_detect = svwks_cable_detect,
338}; 338};
339 339
340static const struct ide_port_info serverworks_chipsets[] __devinitconst = { 340static const struct ide_port_info serverworks_chipsets[] = {
341 { /* 0: OSB4 */ 341 { /* 0: OSB4 */
342 .name = DRV_NAME, 342 .name = DRV_NAME,
343 .init_chipset = init_chipset_svwks, 343 .init_chipset = init_chipset_svwks,
@@ -391,7 +391,7 @@ static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
391 * finds a device matching our IDE device tables. 391 * finds a device matching our IDE device tables.
392 */ 392 */
393 393
394static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id) 394static int svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id)
395{ 395{
396 struct ide_port_info d; 396 struct ide_port_info d;
397 u8 idx = id->driver_data; 397 u8 idx = id->driver_data;
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index e3ea591f66d3..a5ca179a83b3 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -307,8 +307,7 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)
307} 307}
308 308
309/* Creates a DMA map for the scatter-gather list entries */ 309/* Creates a DMA map for the scatter-gather list entries */
310static int __devinit ide_dma_sgiioc4(ide_hwif_t *hwif, 310static int ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
311 const struct ide_port_info *d)
312{ 311{
313 struct pci_dev *dev = to_pci_dev(hwif->dev); 312 struct pci_dev *dev = to_pci_dev(hwif->dev);
314 unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET; 313 unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
@@ -520,7 +519,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = {
520 .dma_lost_irq = sgiioc4_dma_lost_irq, 519 .dma_lost_irq = sgiioc4_dma_lost_irq,
521}; 520};
522 521
523static const struct ide_port_info sgiioc4_port_info __devinitconst = { 522static const struct ide_port_info sgiioc4_port_info = {
524 .name = DRV_NAME, 523 .name = DRV_NAME,
525 .chipset = ide_pci, 524 .chipset = ide_pci,
526 .init_dma = ide_dma_sgiioc4, 525 .init_dma = ide_dma_sgiioc4,
@@ -532,7 +531,7 @@ static const struct ide_port_info sgiioc4_port_info __devinitconst = {
532 .mwdma_mask = ATA_MWDMA2_ONLY, 531 .mwdma_mask = ATA_MWDMA2_ONLY,
533}; 532};
534 533
535static int __devinit sgiioc4_ide_setup_pci_device(struct pci_dev *dev) 534static int sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
536{ 535{
537 unsigned long cmd_base, irqport; 536 unsigned long cmd_base, irqport;
538 unsigned long bar0, cmd_phys_base, ctl; 537 unsigned long bar0, cmd_phys_base, ctl;
@@ -581,7 +580,7 @@ req_mem_rgn_err:
581 return rc; 580 return rc;
582} 581}
583 582
584static unsigned int __devinit pci_init_sgiioc4(struct pci_dev *dev) 583static unsigned int pci_init_sgiioc4(struct pci_dev *dev)
585{ 584{
586 int ret; 585 int ret;
587 586
@@ -601,7 +600,7 @@ out:
601 return ret; 600 return ret;
602} 601}
603 602
604int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd) 603int ioc4_ide_attach_one(struct ioc4_driver_data *idd)
605{ 604{
606 /* 605 /*
607 * PCI-RT does not bring out IDE connection. 606 * PCI-RT does not bring out IDE connection.
@@ -613,7 +612,7 @@ int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd)
613 return pci_init_sgiioc4(idd->idd_pdev); 612 return pci_init_sgiioc4(idd->idd_pdev);
614} 613}
615 614
616static struct ioc4_submodule __devinitdata ioc4_ide_submodule = { 615static struct ioc4_submodule ioc4_ide_submodule = {
617 .is_name = "IOC4_ide", 616 .is_name = "IOC4_ide",
618 .is_owner = THIS_MODULE, 617 .is_owner = THIS_MODULE,
619 .is_probe = ioc4_ide_attach_one, 618 .is_probe = ioc4_ide_attach_one,
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
index 46f7e30d3790..6a1849bb476c 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -546,7 +546,7 @@ static int init_chipset_siimage(struct pci_dev *dev)
546 * extended PRD tables. For better SI3112 support use the libata driver 546 * extended PRD tables. For better SI3112 support use the libata driver
547 */ 547 */
548 548
549static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif) 549static void init_mmio_iops_siimage(ide_hwif_t *hwif)
550{ 550{
551 struct pci_dev *dev = to_pci_dev(hwif->dev); 551 struct pci_dev *dev = to_pci_dev(hwif->dev);
552 struct ide_host *host = pci_get_drvdata(dev); 552 struct ide_host *host = pci_get_drvdata(dev);
@@ -646,7 +646,7 @@ static void sil_quirkproc(ide_drive_t *drive)
646 * can get the iops right before using them. 646 * can get the iops right before using them.
647 */ 647 */
648 648
649static void __devinit init_iops_siimage(ide_hwif_t *hwif) 649static void init_iops_siimage(ide_hwif_t *hwif)
650{ 650{
651 struct pci_dev *dev = to_pci_dev(hwif->dev); 651 struct pci_dev *dev = to_pci_dev(hwif->dev);
652 struct ide_host *host = pci_get_drvdata(dev); 652 struct ide_host *host = pci_get_drvdata(dev);
@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
719 .udma_mask = ATA_UDMA6, \ 719 .udma_mask = ATA_UDMA6, \
720 } 720 }
721 721
722static const struct ide_port_info siimage_chipsets[] __devinitconst = { 722static const struct ide_port_info siimage_chipsets[] = {
723 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops), 723 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
724 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops) 724 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
725}; 725};
@@ -733,8 +733,7 @@ static const struct ide_port_info siimage_chipsets[] __devinitconst = {
733 * We then use the IDE PCI generic helper to do most of the work. 733 * We then use the IDE PCI generic helper to do most of the work.
734 */ 734 */
735 735
736static int __devinit siimage_init_one(struct pci_dev *dev, 736static int siimage_init_one(struct pci_dev *dev, const struct pci_device_id *id)
737 const struct pci_device_id *id)
738{ 737{
739 void __iomem *ioaddr = NULL; 738 void __iomem *ioaddr = NULL;
740 resource_size_t bar5 = pci_resource_start(dev, 5); 739 resource_size_t bar5 = pci_resource_start(dev, 5);
@@ -790,7 +789,7 @@ static int __devinit siimage_init_one(struct pci_dev *dev,
790 return rc; 789 return rc;
791} 790}
792 791
793static void __devexit siimage_remove(struct pci_dev *dev) 792static void siimage_remove(struct pci_dev *dev)
794{ 793{
795 struct ide_host *host = pci_get_drvdata(dev); 794 struct ide_host *host = pci_get_drvdata(dev);
796 void __iomem *ioaddr = host->host_priv; 795 void __iomem *ioaddr = host->host_priv;
@@ -822,7 +821,7 @@ static struct pci_driver siimage_pci_driver = {
822 .name = "SiI_IDE", 821 .name = "SiI_IDE",
823 .id_table = siimage_pci_tbl, 822 .id_table = siimage_pci_tbl,
824 .probe = siimage_init_one, 823 .probe = siimage_init_one,
825 .remove = __devexit_p(siimage_remove), 824 .remove = siimage_remove,
826 .suspend = ide_pci_suspend, 825 .suspend = ide_pci_suspend,
827 .resume = ide_pci_resume, 826 .resume = ide_pci_resume,
828}; 827};
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index 09e61b4c5e94..247853ea1368 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -362,7 +362,7 @@ static u8 sis_ata133_udma_filter(ide_drive_t *drive)
362 return (regdw & 0x08) ? ATA_UDMA6 : ATA_UDMA5; 362 return (regdw & 0x08) ? ATA_UDMA6 : ATA_UDMA5;
363} 363}
364 364
365static int __devinit sis_find_family(struct pci_dev *dev) 365static int sis_find_family(struct pci_dev *dev)
366{ 366{
367 struct pci_dev *host; 367 struct pci_dev *host;
368 int i = 0; 368 int i = 0;
@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
563 .cable_detect = sis_cable_detect, 563 .cable_detect = sis_cable_detect,
564}; 564};
565 565
566static const struct ide_port_info sis5513_chipset __devinitconst = { 566static const struct ide_port_info sis5513_chipset = {
567 .name = DRV_NAME, 567 .name = DRV_NAME,
568 .init_chipset = init_chipset_sis5513, 568 .init_chipset = init_chipset_sis5513,
569 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} }, 569 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
@@ -572,7 +572,7 @@ static const struct ide_port_info sis5513_chipset __devinitconst = {
572 .mwdma_mask = ATA_MWDMA2, 572 .mwdma_mask = ATA_MWDMA2,
573}; 573};
574 574
575static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id) 575static int sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id)
576{ 576{
577 struct ide_port_info d = sis5513_chipset; 577 struct ide_port_info d = sis5513_chipset;
578 u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f }; 578 u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f };
@@ -595,7 +595,7 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
595 return ide_pci_init_one(dev, &d, NULL); 595 return ide_pci_init_one(dev, &d, NULL);
596} 596}
597 597
598static void __devexit sis5513_remove(struct pci_dev *dev) 598static void sis5513_remove(struct pci_dev *dev)
599{ 599{
600 ide_pci_remove(dev); 600 ide_pci_remove(dev);
601 pci_disable_device(dev); 601 pci_disable_device(dev);
@@ -613,7 +613,7 @@ static struct pci_driver sis5513_pci_driver = {
613 .name = "SIS_IDE", 613 .name = "SIS_IDE",
614 .id_table = sis5513_pci_tbl, 614 .id_table = sis5513_pci_tbl,
615 .probe = sis5513_init_one, 615 .probe = sis5513_init_one,
616 .remove = __devexit_p(sis5513_remove), 616 .remove = sis5513_remove,
617 .suspend = ide_pci_suspend, 617 .suspend = ide_pci_suspend,
618 .resume = ide_pci_resume, 618 .resume = ide_pci_resume,
619}; 619};
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index d051cd224bdb..8755df3330a0 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
299 .dma_sff_read_status = ide_dma_sff_read_status, 299 .dma_sff_read_status = ide_dma_sff_read_status,
300}; 300};
301 301
302static const struct ide_port_info sl82c105_chipset __devinitconst = { 302static const struct ide_port_info sl82c105_chipset = {
303 .name = DRV_NAME, 303 .name = DRV_NAME,
304 .init_chipset = init_chipset_sl82c105, 304 .init_chipset = init_chipset_sl82c105,
305 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}}, 305 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
@@ -313,7 +313,7 @@ static const struct ide_port_info sl82c105_chipset __devinitconst = {
313 .mwdma_mask = ATA_MWDMA2, 313 .mwdma_mask = ATA_MWDMA2,
314}; 314};
315 315
316static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id) 316static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id)
317{ 317{
318 struct ide_port_info d = sl82c105_chipset; 318 struct ide_port_info d = sl82c105_chipset;
319 u8 rev = sl82c105_bridge_revision(dev); 319 u8 rev = sl82c105_bridge_revision(dev);
diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
index 863a5e9283ca..8af92bbb3dcb 100644
--- a/drivers/ide/slc90e66.c
+++ b/drivers/ide/slc90e66.c
@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
132 .cable_detect = slc90e66_cable_detect, 132 .cable_detect = slc90e66_cable_detect,
133}; 133};
134 134
135static const struct ide_port_info slc90e66_chipset __devinitconst = { 135static const struct ide_port_info slc90e66_chipset = {
136 .name = DRV_NAME, 136 .name = DRV_NAME,
137 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, 137 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
138 .port_ops = &slc90e66_port_ops, 138 .port_ops = &slc90e66_port_ops,
@@ -142,7 +142,8 @@ static const struct ide_port_info slc90e66_chipset __devinitconst = {
142 .udma_mask = ATA_UDMA4, 142 .udma_mask = ATA_UDMA4,
143}; 143};
144 144
145static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id) 145static int slc90e66_init_one(struct pci_dev *dev,
146 const struct pci_device_id *id)
146{ 147{
147 return ide_pci_init_one(dev, &slc90e66_chipset, NULL); 148 return ide_pci_init_one(dev, &slc90e66_chipset, NULL);
148} 149}
diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
index 17946785ebf6..17e6132b99bf 100644
--- a/drivers/ide/tc86c001.c
+++ b/drivers/ide/tc86c001.c
@@ -144,7 +144,7 @@ static u8 tc86c001_cable_detect(ide_hwif_t *hwif)
144 return (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; 144 return (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
145} 145}
146 146
147static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif) 147static void init_hwif_tc86c001(ide_hwif_t *hwif)
148{ 148{
149 struct pci_dev *dev = to_pci_dev(hwif->dev); 149 struct pci_dev *dev = to_pci_dev(hwif->dev);
150 unsigned long sc_base = pci_resource_start(dev, 5); 150 unsigned long sc_base = pci_resource_start(dev, 5);
@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
192 .dma_sff_read_status = ide_dma_sff_read_status, 192 .dma_sff_read_status = ide_dma_sff_read_status,
193}; 193};
194 194
195static const struct ide_port_info tc86c001_chipset __devinitconst = { 195static const struct ide_port_info tc86c001_chipset = {
196 .name = DRV_NAME, 196 .name = DRV_NAME,
197 .init_hwif = init_hwif_tc86c001, 197 .init_hwif = init_hwif_tc86c001,
198 .port_ops = &tc86c001_port_ops, 198 .port_ops = &tc86c001_port_ops,
@@ -203,8 +203,8 @@ static const struct ide_port_info tc86c001_chipset __devinitconst = {
203 .udma_mask = ATA_UDMA4, 203 .udma_mask = ATA_UDMA4,
204}; 204};
205 205
206static int __devinit tc86c001_init_one(struct pci_dev *dev, 206static int tc86c001_init_one(struct pci_dev *dev,
207 const struct pci_device_id *id) 207 const struct pci_device_id *id)
208{ 208{
209 int rc; 209 int rc;
210 210
@@ -232,7 +232,7 @@ out:
232 return rc; 232 return rc;
233} 233}
234 234
235static void __devexit tc86c001_remove(struct pci_dev *dev) 235static void tc86c001_remove(struct pci_dev *dev)
236{ 236{
237 ide_pci_remove(dev); 237 ide_pci_remove(dev);
238 pci_release_region(dev, 5); 238 pci_release_region(dev, 5);
@@ -249,7 +249,7 @@ static struct pci_driver tc86c001_pci_driver = {
249 .name = "TC86C001", 249 .name = "TC86C001",
250 .id_table = tc86c001_pci_tbl, 250 .id_table = tc86c001_pci_tbl,
251 .probe = tc86c001_init_one, 251 .probe = tc86c001_init_one,
252 .remove = __devexit_p(tc86c001_remove), 252 .remove = tc86c001_remove,
253}; 253};
254 254
255static int __init tc86c001_ide_init(void) 255static int __init tc86c001_ide_init(void)
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
index 55ce1b80efcb..7f1af9493f0e 100644
--- a/drivers/ide/triflex.c
+++ b/drivers/ide/triflex.c
@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
92 .set_dma_mode = triflex_set_mode, 92 .set_dma_mode = triflex_set_mode,
93}; 93};
94 94
95static const struct ide_port_info triflex_device __devinitconst = { 95static const struct ide_port_info triflex_device = {
96 .name = DRV_NAME, 96 .name = DRV_NAME,
97 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, 97 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
98 .port_ops = &triflex_port_ops, 98 .port_ops = &triflex_port_ops,
@@ -101,8 +101,7 @@ static const struct ide_port_info triflex_device __devinitconst = {
101 .mwdma_mask = ATA_MWDMA2, 101 .mwdma_mask = ATA_MWDMA2,
102}; 102};
103 103
104static int __devinit triflex_init_one(struct pci_dev *dev, 104static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
105 const struct pci_device_id *id)
106{ 105{
107 return ide_pci_init_one(dev, &triflex_device, NULL); 106 return ide_pci_init_one(dev, &triflex_device, NULL);
108} 107}
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index e494a98a43a9..0069f6ce74cf 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -231,7 +231,7 @@ static void trm290_dma_host_set(ide_drive_t *drive, int on)
231{ 231{
232} 232}
233 233
234static void __devinit init_hwif_trm290(ide_hwif_t *hwif) 234static void init_hwif_trm290(ide_hwif_t *hwif)
235{ 235{
236 struct pci_dev *dev = to_pci_dev(hwif->dev); 236 struct pci_dev *dev = to_pci_dev(hwif->dev);
237 unsigned int cfg_base = pci_resource_start(dev, 4); 237 unsigned int cfg_base = pci_resource_start(dev, 4);
@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
324 .dma_check = trm290_dma_check, 324 .dma_check = trm290_dma_check,
325}; 325};
326 326
327static const struct ide_port_info trm290_chipset __devinitconst = { 327static const struct ide_port_info trm290_chipset = {
328 .name = DRV_NAME, 328 .name = DRV_NAME,
329 .init_hwif = init_hwif_trm290, 329 .init_hwif = init_hwif_trm290,
330 .tp_ops = &trm290_tp_ops, 330 .tp_ops = &trm290_tp_ops,
@@ -338,7 +338,7 @@ static const struct ide_port_info trm290_chipset __devinitconst = {
338 IDE_HFLAG_NO_LBA48, 338 IDE_HFLAG_NO_LBA48,
339}; 339};
340 340
341static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) 341static int trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)
342{ 342{
343 return ide_pci_init_one(dev, &trm290_chipset, NULL); 343 return ide_pci_init_one(dev, &trm290_chipset, NULL);
344} 344}
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index eb7767864d10..01464f1e2339 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
403 .cable_detect = via82cxxx_cable_detect, 403 .cable_detect = via82cxxx_cable_detect,
404}; 404};
405 405
406static const struct ide_port_info via82cxxx_chipset __devinitconst = { 406static const struct ide_port_info via82cxxx_chipset = {
407 .name = DRV_NAME, 407 .name = DRV_NAME,
408 .init_chipset = init_chipset_via82cxxx, 408 .init_chipset = init_chipset_via82cxxx,
409 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } }, 409 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
@@ -416,7 +416,7 @@ static const struct ide_port_info via82cxxx_chipset __devinitconst = {
416 .mwdma_mask = ATA_MWDMA2, 416 .mwdma_mask = ATA_MWDMA2,
417}; 417};
418 418
419static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id) 419static int via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
420{ 420{
421 struct pci_dev *isa = NULL; 421 struct pci_dev *isa = NULL;
422 struct via_isa_bridge *via_config; 422 struct via_isa_bridge *via_config;
@@ -489,7 +489,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
489 return rc; 489 return rc;
490} 490}
491 491
492static void __devexit via_remove(struct pci_dev *dev) 492static void via_remove(struct pci_dev *dev)
493{ 493{
494 struct ide_host *host = pci_get_drvdata(dev); 494 struct ide_host *host = pci_get_drvdata(dev);
495 struct via82cxxx_dev *vdev = host->host_priv; 495 struct via82cxxx_dev *vdev = host->host_priv;
@@ -514,7 +514,7 @@ static struct pci_driver via_pci_driver = {
514 .name = "VIA_IDE", 514 .name = "VIA_IDE",
515 .id_table = via_pci_tbl, 515 .id_table = via_pci_tbl,
516 .probe = via_init_one, 516 .probe = via_init_one,
517 .remove = __devexit_p(via_remove), 517 .remove = via_remove,
518 .suspend = ide_pci_suspend, 518 .suspend = ide_pci_suspend,
519 .resume = ide_pci_resume, 519 .resume = ide_pci_resume,
520}; 520};
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-12 01:58:10 -0500