sections: fix section conflicts in drivers/ide

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

sections: fix section conflicts in drivers/ide

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Andi Kleen and committed by

Linus Torvalds 13 years ago e6b53703 1849f23d

+53 -53

41 changed files

expand all collapse all

drivers

ide

aec62xx.c

ali14xx.c

alim15x3.c

amd74xx.c

atiixp.c

cmd640.c

cmd64x.c

cs5520.c

cs5530.c

cs5535.c

cy82c693.c

dtc2278.c

hpt366.c

ht6560b.c

icside.c

ide-pci-generic.c

it8172.c

it8213.c

it821x.c

jmicron.c

ns87415.c

opti621.c

pdc202xx_new.c

pdc202xx_old.c

piix.c

qd65xx.c

rz1000.c

sc1200.c

scc_pata.c

serverworks.c

siimage.c

sis5513.c

sl82c105.c

slc90e66.c

tc86c001.c

triflex.c

trm290.c

tx4938ide.c

tx4939ide.c

umc8672.c

via82cxxx.c

+1 -1

drivers/ide/aec62xx.c

reviewed

··· 181 181 .cable_detect = atp86x_cable_detect, 182 182 }; 183 183 184 184 - static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 184 184 + static const struct ide_port_info aec62xx_chipsets[] __devinitconst = { 185 185 { /* 0: AEC6210 */ 186 186 .name = DRV_NAME, 187 187 .init_chipset = init_chipset_aec62xx,

+2 -2

drivers/ide/ali14xx.c

reviewed

··· 52 52 53 53 /* port addresses for auto-detection */ 54 54 #define ALI_NUM_PORTS 4 55 55 - static const int ports[ALI_NUM_PORTS] __initdata = 55 55 + static const int ports[ALI_NUM_PORTS] __initconst = 56 56 { 0x074, 0x0f4, 0x034, 0x0e4 }; 57 57 58 58 /* register initialization data */ 59 59 typedef struct { u8 reg, data; } RegInitializer; 60 60 61 61 - static const RegInitializer initData[] __initdata = { 61 61 + static const RegInitializer initData[] __initconst = { 62 62 {0x01, 0x0f}, {0x02, 0x00}, {0x03, 0x00}, {0x04, 0x00}, 63 63 {0x05, 0x00}, {0x06, 0x00}, {0x07, 0x2b}, {0x0a, 0x0f}, 64 64 {0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00}, {0x28, 0x00},

+1 -1

drivers/ide/alim15x3.c

reviewed

··· 512 512 .dma_sff_read_status = ide_dma_sff_read_status, 513 513 }; 514 514 515 515 - static const struct ide_port_info ali15x3_chipset __devinitdata = { 515 515 + static const struct ide_port_info ali15x3_chipset __devinitconst = { 516 516 .name = DRV_NAME, 517 517 .init_chipset = init_chipset_ali15x3, 518 518 .init_hwif = init_hwif_ali15x3,

+1 -1

drivers/ide/amd74xx.c

reviewed

··· 223 223 .udma_mask = udma, \ 224 224 } 225 225 226 226 - static const struct ide_port_info amd74xx_chipsets[] __devinitdata = { 226 226 + static const struct ide_port_info amd74xx_chipsets[] __devinitconst = { 227 227 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2), 228 228 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4), 229 229 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),

+1 -1

drivers/ide/atiixp.c

reviewed

··· 139 139 .cable_detect = atiixp_cable_detect, 140 140 }; 141 141 142 142 - static const struct ide_port_info atiixp_pci_info[] __devinitdata = { 142 142 + static const struct ide_port_info atiixp_pci_info[] __devinitconst = { 143 143 { /* 0: IXP200/300/400/700 */ 144 144 .name = DRV_NAME, 145 145 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},

+1 -1

drivers/ide/cmd640.c

reviewed

··· 685 685 return 0; 686 686 } 687 687 688 688 - static const struct ide_port_info cmd640_port_info __initdata = { 688 688 + static const struct ide_port_info cmd640_port_info __initconst = { 689 689 .chipset = ide_cmd640, 690 690 .host_flags = IDE_HFLAG_SERIALIZE | 691 691 IDE_HFLAG_NO_DMA |

+1 -1

drivers/ide/cmd64x.c

reviewed

··· 327 327 .dma_sff_read_status = ide_dma_sff_read_status, 328 328 }; 329 329 330 330 - static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 330 330 + static const struct ide_port_info cmd64x_chipsets[] __devinitconst = { 331 331 { /* 0: CMD643 */ 332 332 .name = DRV_NAME, 333 333 .init_chipset = init_chipset_cmd64x,

+1 -1

drivers/ide/cs5520.c

reviewed

··· 94 94 .set_dma_mode = cs5520_set_dma_mode, 95 95 }; 96 96 97 97 - static const struct ide_port_info cyrix_chipset __devinitdata = { 97 97 + static const struct ide_port_info cyrix_chipset __devinitconst = { 98 98 .name = DRV_NAME, 99 99 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } }, 100 100 .port_ops = &cs5520_port_ops,

+1 -1

drivers/ide/cs5530.c

reviewed

··· 245 245 .udma_filter = cs5530_udma_filter, 246 246 }; 247 247 248 248 - static const struct ide_port_info cs5530_chipset __devinitdata = { 248 248 + static const struct ide_port_info cs5530_chipset __devinitconst = { 249 249 .name = DRV_NAME, 250 250 .init_chipset = init_chipset_cs5530, 251 251 .init_hwif = init_hwif_cs5530,

+1 -1

drivers/ide/cs5535.c

reviewed

··· 170 170 .cable_detect = cs5535_cable_detect, 171 171 }; 172 172 173 173 - static const struct ide_port_info cs5535_chipset __devinitdata = { 173 173 + static const struct ide_port_info cs5535_chipset __devinitconst = { 174 174 .name = DRV_NAME, 175 175 .port_ops = &cs5535_port_ops, 176 176 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,

+1 -1

drivers/ide/cy82c693.c

reviewed

··· 163 163 .set_dma_mode = cy82c693_set_dma_mode, 164 164 }; 165 165 166 166 - static const struct ide_port_info cy82c693_chipset __devinitdata = { 166 166 + static const struct ide_port_info cy82c693_chipset __devinitconst = { 167 167 .name = DRV_NAME, 168 168 .init_iops = init_iops_cy82c693, 169 169 .port_ops = &cy82c693_port_ops,

+1 -1

drivers/ide/dtc2278.c

reviewed

··· 91 91 .set_pio_mode = dtc2278_set_pio_mode, 92 92 }; 93 93 94 94 - static const struct ide_port_info dtc2278_port_info __initdata = { 94 94 + static const struct ide_port_info dtc2278_port_info __initconst = { 95 95 .name = DRV_NAME, 96 96 .chipset = ide_dtc2278, 97 97 .port_ops = &dtc2278_port_ops,

+12 -12

drivers/ide/hpt366.c

reviewed

··· 443 443 } 444 444 }; 445 445 446 446 - static const struct hpt_info hpt36x __devinitdata = { 446 446 + static const struct hpt_info hpt36x __devinitconst = { 447 447 .chip_name = "HPT36x", 448 448 .chip_type = HPT36x, 449 449 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2, ··· 451 451 .timings = &hpt36x_timings 452 452 }; 453 453 454 454 - static const struct hpt_info hpt370 __devinitdata = { 454 454 + static const struct hpt_info hpt370 __devinitconst = { 455 455 .chip_name = "HPT370", 456 456 .chip_type = HPT370, 457 457 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, ··· 459 459 .timings = &hpt37x_timings 460 460 }; 461 461 462 462 - static const struct hpt_info hpt370a __devinitdata = { 462 462 + static const struct hpt_info hpt370a __devinitconst = { 463 463 .chip_name = "HPT370A", 464 464 .chip_type = HPT370A, 465 465 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, ··· 467 467 .timings = &hpt37x_timings 468 468 }; 469 469 470 470 - static const struct hpt_info hpt374 __devinitdata = { 470 470 + static const struct hpt_info hpt374 __devinitconst = { 471 471 .chip_name = "HPT374", 472 472 .chip_type = HPT374, 473 473 .udma_mask = ATA_UDMA5, ··· 475 475 .timings = &hpt37x_timings 476 476 }; 477 477 478 478 - static const struct hpt_info hpt372 __devinitdata = { 478 478 + static const struct hpt_info hpt372 __devinitconst = { 479 479 .chip_name = "HPT372", 480 480 .chip_type = HPT372, 481 481 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 483 483 .timings = &hpt37x_timings 484 484 }; 485 485 486 486 - static const struct hpt_info hpt372a __devinitdata = { 486 486 + static const struct hpt_info hpt372a __devinitconst = { 487 487 .chip_name = "HPT372A", 488 488 .chip_type = HPT372A, 489 489 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 491 491 .timings = &hpt37x_timings 492 492 }; 493 493 494 494 - static const struct hpt_info hpt302 __devinitdata = { 494 494 + static const struct hpt_info hpt302 __devinitconst = { 495 495 .chip_name = "HPT302", 496 496 .chip_type = HPT302, 497 497 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 499 499 .timings = &hpt37x_timings 500 500 }; 501 501 502 502 - static const struct hpt_info hpt371 __devinitdata = { 502 502 + static const struct hpt_info hpt371 __devinitconst = { 503 503 .chip_name = "HPT371", 504 504 .chip_type = HPT371, 505 505 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 507 507 .timings = &hpt37x_timings 508 508 }; 509 509 510 510 - static const struct hpt_info hpt372n __devinitdata = { 510 510 + static const struct hpt_info hpt372n __devinitconst = { 511 511 .chip_name = "HPT372N", 512 512 .chip_type = HPT372N, 513 513 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 515 515 .timings = &hpt37x_timings 516 516 }; 517 517 518 518 - static const struct hpt_info hpt302n __devinitdata = { 518 518 + static const struct hpt_info hpt302n __devinitconst = { 519 519 .chip_name = "HPT302N", 520 520 .chip_type = HPT302N, 521 521 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 523 523 .timings = &hpt37x_timings 524 524 }; 525 525 526 526 - static const struct hpt_info hpt371n __devinitdata = { 526 526 + static const struct hpt_info hpt371n __devinitconst = { 527 527 .chip_name = "HPT371N", 528 528 .chip_type = HPT371N, 529 529 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, ··· 1361 1361 .dma_sff_read_status = ide_dma_sff_read_status, 1362 1362 }; 1363 1363 1364 1364 - static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 1364 1364 + static const struct ide_port_info hpt366_chipsets[] __devinitconst = { 1365 1365 { /* 0: HPT36x */ 1366 1366 .name = DRV_NAME, 1367 1367 .init_chipset = init_chipset_hpt366,

+1 -1

drivers/ide/ht6560b.c

reviewed

··· 341 341 .set_pio_mode = ht6560b_set_pio_mode, 342 342 }; 343 343 344 344 - static const struct ide_port_info ht6560b_port_info __initdata = { 344 344 + static const struct ide_port_info ht6560b_port_info __initconst = { 345 345 .name = DRV_NAME, 346 346 .chipset = ide_ht6560b, 347 347 .tp_ops = &ht6560b_tp_ops,

+1 -1

drivers/ide/icside.c

reviewed

··· 451 451 return ret; 452 452 } 453 453 454 454 - static const struct ide_port_info icside_v6_port_info __initdata = { 454 454 + static const struct ide_port_info icside_v6_port_info __initconst = { 455 455 .init_dma = icside_dma_off_init, 456 456 .port_ops = &icside_v6_no_dma_port_ops, 457 457 .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,

+1 -1

drivers/ide/ide-pci-generic.c

reviewed

··· 53 53 .udma_mask = ATA_UDMA6, \ 54 54 } 55 55 56 56 - static const struct ide_port_info generic_chipsets[] __devinitdata = { 56 56 + static const struct ide_port_info generic_chipsets[] __devinitconst = { 57 57 /* 0: Unknown */ 58 58 DECLARE_GENERIC_PCI_DEV(0), 59 59

+1 -1

drivers/ide/it8172.c

reviewed

··· 115 115 .set_dma_mode = it8172_set_dma_mode, 116 116 }; 117 117 118 118 - static const struct ide_port_info it8172_port_info __devinitdata = { 118 118 + static const struct ide_port_info it8172_port_info __devinitconst = { 119 119 .name = DRV_NAME, 120 120 .port_ops = &it8172_port_ops, 121 121 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },

+1 -1

drivers/ide/it8213.c

reviewed

··· 156 156 .cable_detect = it8213_cable_detect, 157 157 }; 158 158 159 159 - static const struct ide_port_info it8213_chipset __devinitdata = { 159 159 + static const struct ide_port_info it8213_chipset __devinitconst = { 160 160 .name = DRV_NAME, 161 161 .enablebits = { {0x41, 0x80, 0x80} }, 162 162 .port_ops = &it8213_port_ops,

+1 -1

drivers/ide/it821x.c

reviewed

··· 630 630 .cable_detect = it821x_cable_detect, 631 631 }; 632 632 633 633 - static const struct ide_port_info it821x_chipset __devinitdata = { 633 633 + static const struct ide_port_info it821x_chipset __devinitconst = { 634 634 .name = DRV_NAME, 635 635 .init_chipset = init_chipset_it821x, 636 636 .init_hwif = init_hwif_it821x,

+1 -1

drivers/ide/jmicron.c

reviewed

··· 102 102 .cable_detect = jmicron_cable_detect, 103 103 }; 104 104 105 105 - static const struct ide_port_info jmicron_chipset __devinitdata = { 105 105 + static const struct ide_port_info jmicron_chipset __devinitconst = { 106 106 .name = DRV_NAME, 107 107 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, 108 108 .port_ops = &jmicron_port_ops,

+1 -1

drivers/ide/ns87415.c

reviewed

··· 293 293 .dma_sff_read_status = superio_dma_sff_read_status, 294 294 }; 295 295 296 296 - static const struct ide_port_info ns87415_chipset __devinitdata = { 296 296 + static const struct ide_port_info ns87415_chipset __devinitconst = { 297 297 .name = DRV_NAME, 298 298 .init_hwif = init_hwif_ns87415, 299 299 .tp_ops = &ns87415_tp_ops,

+1 -1

drivers/ide/opti621.c

reviewed

··· 131 131 .set_pio_mode = opti621_set_pio_mode, 132 132 }; 133 133 134 134 - static const struct ide_port_info opti621_chipset __devinitdata = { 134 134 + static const struct ide_port_info opti621_chipset __devinitconst = { 135 135 .name = DRV_NAME, 136 136 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, 137 137 .port_ops = &opti621_port_ops,

+1 -1

drivers/ide/pdc202xx_new.c

reviewed

··· 465 465 .udma_mask = udma, \ 466 466 } 467 467 468 468 - static const struct ide_port_info pdcnew_chipsets[] __devinitdata = { 468 468 + static const struct ide_port_info pdcnew_chipsets[] __devinitconst = { 469 469 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5), 470 470 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6), 471 471 };

+1 -1

drivers/ide/pdc202xx_old.c

reviewed

··· 270 270 .max_sectors = sectors, \ 271 271 } 272 272 273 273 - static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = { 273 273 + static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = { 274 274 { /* 0: PDC20246 */ 275 275 .name = DRV_NAME, 276 276 .init_chipset = init_chipset_pdc202xx,

+1 -1

drivers/ide/piix.c

reviewed

··· 344 344 .udma_mask = udma, \ 345 345 } 346 346 347 347 - static const struct ide_port_info piix_pci_info[] __devinitdata = { 347 347 + static const struct ide_port_info piix_pci_info[] __devinitconst = { 348 348 /* 0: MPIIX */ 349 349 { /* 350 350 * MPIIX actually has only a single IDE channel mapped to

+1 -1

drivers/ide/qd65xx.c

reviewed

··· 335 335 .set_pio_mode = qd6580_set_pio_mode, 336 336 }; 337 337 338 338 - static const struct ide_port_info qd65xx_port_info __initdata = { 338 338 + static const struct ide_port_info qd65xx_port_info __initconst = { 339 339 .name = DRV_NAME, 340 340 .tp_ops = &qd65xx_tp_ops, 341 341 .chipset = ide_qd65xx,

+1 -1

drivers/ide/rz1000.c

reviewed

··· 38 38 } 39 39 } 40 40 41 41 - static const struct ide_port_info rz1000_chipset __devinitdata = { 41 41 + static const struct ide_port_info rz1000_chipset __devinitconst = { 42 42 .name = DRV_NAME, 43 43 .host_flags = IDE_HFLAG_NO_DMA, 44 44 };

+1 -1

drivers/ide/sc1200.c

reviewed

··· 291 291 .dma_sff_read_status = ide_dma_sff_read_status, 292 292 }; 293 293 294 294 - static const struct ide_port_info sc1200_chipset __devinitdata = { 294 294 + static const struct ide_port_info sc1200_chipset __devinitconst = { 295 295 .name = DRV_NAME, 296 296 .port_ops = &sc1200_port_ops, 297 297 .dma_ops = &sc1200_dma_ops,

+1 -1

drivers/ide/scc_pata.c

reviewed

··· 811 811 .dma_sff_read_status = scc_dma_sff_read_status, 812 812 }; 813 813 814 814 - static const struct ide_port_info scc_chipset __devinitdata = { 814 814 + static const struct ide_port_info scc_chipset __devinitconst = { 815 815 .name = "sccIDE", 816 816 .init_iops = init_iops_scc, 817 817 .init_dma = scc_init_dma,

+1 -1

drivers/ide/serverworks.c

reviewed

··· 337 337 .cable_detect = svwks_cable_detect, 338 338 }; 339 339 340 340 - static const struct ide_port_info serverworks_chipsets[] __devinitdata = { 340 340 + static const struct ide_port_info serverworks_chipsets[] __devinitconst = { 341 341 { /* 0: OSB4 */ 342 342 .name = DRV_NAME, 343 343 .init_chipset = init_chipset_svwks,

+1 -1

drivers/ide/siimage.c

reviewed

··· 719 719 .udma_mask = ATA_UDMA6, \ 720 720 } 721 721 722 722 - static const struct ide_port_info siimage_chipsets[] __devinitdata = { 722 722 + static const struct ide_port_info siimage_chipsets[] __devinitconst = { 723 723 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops), 724 724 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops) 725 725 };

+1 -1

drivers/ide/sis5513.c

reviewed

··· 563 563 .cable_detect = sis_cable_detect, 564 564 }; 565 565 566 566 - static const struct ide_port_info sis5513_chipset __devinitdata = { 566 566 + static const struct ide_port_info sis5513_chipset __devinitconst = { 567 567 .name = DRV_NAME, 568 568 .init_chipset = init_chipset_sis5513, 569 569 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },

+1 -1

drivers/ide/sl82c105.c

reviewed

··· 299 299 .dma_sff_read_status = ide_dma_sff_read_status, 300 300 }; 301 301 302 302 - static const struct ide_port_info sl82c105_chipset __devinitdata = { 302 302 + static const struct ide_port_info sl82c105_chipset __devinitconst = { 303 303 .name = DRV_NAME, 304 304 .init_chipset = init_chipset_sl82c105, 305 305 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},

+1 -1

drivers/ide/slc90e66.c

reviewed

··· 132 132 .cable_detect = slc90e66_cable_detect, 133 133 }; 134 134 135 135 - static const struct ide_port_info slc90e66_chipset __devinitdata = { 135 135 + static const struct ide_port_info slc90e66_chipset __devinitconst = { 136 136 .name = DRV_NAME, 137 137 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, 138 138 .port_ops = &slc90e66_port_ops,

+1 -1

drivers/ide/tc86c001.c

reviewed

··· 192 192 .dma_sff_read_status = ide_dma_sff_read_status, 193 193 }; 194 194 195 195 - static const struct ide_port_info tc86c001_chipset __devinitdata = { 195 195 + static const struct ide_port_info tc86c001_chipset __devinitconst = { 196 196 .name = DRV_NAME, 197 197 .init_hwif = init_hwif_tc86c001, 198 198 .port_ops = &tc86c001_port_ops,

+1 -1

drivers/ide/triflex.c

reviewed

··· 92 92 .set_dma_mode = triflex_set_mode, 93 93 }; 94 94 95 95 - static const struct ide_port_info triflex_device __devinitdata = { 95 95 + static const struct ide_port_info triflex_device __devinitconst = { 96 96 .name = DRV_NAME, 97 97 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, 98 98 .port_ops = &triflex_port_ops,

+1 -1

drivers/ide/trm290.c

reviewed

··· 324 324 .dma_check = trm290_dma_check, 325 325 }; 326 326 327 327 - static const struct ide_port_info trm290_chipset __devinitdata = { 327 327 + static const struct ide_port_info trm290_chipset __devinitconst = { 328 328 .name = DRV_NAME, 329 329 .init_hwif = init_hwif_trm290, 330 330 .tp_ops = &trm290_tp_ops,

+1 -1

drivers/ide/tx4938ide.c

reviewed

··· 117 117 .set_pio_mode = tx4938ide_set_pio_mode, 118 118 }; 119 119 120 120 - static const struct ide_port_info tx4938ide_port_info __initdata = { 120 120 + static const struct ide_port_info tx4938ide_port_info __initconst = { 121 121 .port_ops = &tx4938ide_port_ops, 122 122 #ifdef __BIG_ENDIAN 123 123 .tp_ops = &tx4938ide_tp_ops,

+1 -1

drivers/ide/tx4939ide.c

reviewed

··· 522 522 .dma_sff_read_status = tx4939ide_dma_sff_read_status, 523 523 }; 524 524 525 525 - static const struct ide_port_info tx4939ide_port_info __initdata = { 525 525 + static const struct ide_port_info tx4939ide_port_info __initconst = { 526 526 .init_hwif = tx4939ide_init_hwif, 527 527 .init_dma = tx4939ide_init_dma, 528 528 .port_ops = &tx4939ide_port_ops,

+1 -1

drivers/ide/umc8672.c

reviewed

··· 128 128 .set_pio_mode = umc_set_pio_mode, 129 129 }; 130 130 131 131 - static const struct ide_port_info umc8672_port_info __initdata = { 131 131 + static const struct ide_port_info umc8672_port_info __initconst = { 132 132 .name = DRV_NAME, 133 133 .chipset = ide_umc8672, 134 134 .port_ops = &umc8672_port_ops,

+1 -1

drivers/ide/via82cxxx.c

reviewed

··· 403 403 .cable_detect = via82cxxx_cable_detect, 404 404 }; 405 405 406 406 - static const struct ide_port_info via82cxxx_chipset __devinitdata = { 406 406 + static const struct ide_port_info via82cxxx_chipset __devinitconst = { 407 407 .name = DRV_NAME, 408 408 .init_chipset = init_chipset_via82cxxx, 409 409 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },