diff options
Diffstat (limited to 'drivers/ide/pci')
29 files changed, 32 insertions, 55 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index cfb3265bc1a8..c9ba15afe97d 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -220,7 +220,8 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { | |||
220 | .init_hwif = init_hwif_aec62xx, | 220 | .init_hwif = init_hwif_aec62xx, |
221 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 221 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
222 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | | 222 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | |
223 | IDE_HFLAG_ABUSE_SET_DMA_MODE, | 223 | IDE_HFLAG_ABUSE_SET_DMA_MODE | |
224 | IDE_HFLAG_NON_BOOTABLE, | ||
224 | .pio_mask = ATA_PIO4, | 225 | .pio_mask = ATA_PIO4, |
225 | .mwdma_mask = ATA_MWDMA2, | 226 | .mwdma_mask = ATA_MWDMA2, |
226 | .udma_mask = ATA_UDMA4, | 227 | .udma_mask = ATA_UDMA4, |
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index b3b6f514ce2d..3fa2d9f7b1b2 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -750,7 +750,6 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { | |||
750 | .init_chipset = init_chipset_ali15x3, | 750 | .init_chipset = init_chipset_ali15x3, |
751 | .init_hwif = init_hwif_ali15x3, | 751 | .init_hwif = init_hwif_ali15x3, |
752 | .init_dma = init_dma_ali15x3, | 752 | .init_dma = init_dma_ali15x3, |
753 | .host_flags = IDE_HFLAG_BOOTABLE, | ||
754 | .pio_mask = ATA_PIO5, | 753 | .pio_mask = ATA_PIO5, |
755 | .swdma_mask = ATA_SWDMA2, | 754 | .swdma_mask = ATA_SWDMA2, |
756 | .mwdma_mask = ATA_MWDMA2, | 755 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 2ef890ce8097..68517267d31e 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -223,8 +223,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
223 | IDE_HFLAG_ABUSE_SET_DMA_MODE | \ | 223 | IDE_HFLAG_ABUSE_SET_DMA_MODE | \ |
224 | IDE_HFLAG_POST_SET_MODE | \ | 224 | IDE_HFLAG_POST_SET_MODE | \ |
225 | IDE_HFLAG_IO_32BIT | \ | 225 | IDE_HFLAG_IO_32BIT | \ |
226 | IDE_HFLAG_UNMASK_IRQS | \ | 226 | IDE_HFLAG_UNMASK_IRQS) |
227 | IDE_HFLAG_BOOTABLE) | ||
228 | 227 | ||
229 | #define DECLARE_AMD_DEV(name_str, swdma, udma) \ | 228 | #define DECLARE_AMD_DEV(name_str, swdma, udma) \ |
230 | { \ | 229 | { \ |
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c index 7e037c880cb0..91722f88b7bd 100644 --- a/drivers/ide/pci/atiixp.c +++ b/drivers/ide/pci/atiixp.c | |||
@@ -151,7 +151,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { | |||
151 | .name = "ATIIXP", | 151 | .name = "ATIIXP", |
152 | .init_hwif = init_hwif_atiixp, | 152 | .init_hwif = init_hwif_atiixp, |
153 | .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, | 153 | .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, |
154 | .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE, | 154 | .host_flags = IDE_HFLAG_LEGACY_IRQS, |
155 | .pio_mask = ATA_PIO4, | 155 | .pio_mask = ATA_PIO4, |
156 | .mwdma_mask = ATA_MWDMA2, | 156 | .mwdma_mask = ATA_MWDMA2, |
157 | .udma_mask = ATA_UDMA5, | 157 | .udma_mask = ATA_UDMA5, |
@@ -159,8 +159,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { | |||
159 | .name = "SB600_PATA", | 159 | .name = "SB600_PATA", |
160 | .init_hwif = init_hwif_atiixp, | 160 | .init_hwif = init_hwif_atiixp, |
161 | .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}}, | 161 | .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}}, |
162 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS | | 162 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS, |
163 | IDE_HFLAG_BOOTABLE, | ||
164 | .pio_mask = ATA_PIO4, | 163 | .pio_mask = ATA_PIO4, |
165 | .mwdma_mask = ATA_MWDMA2, | 164 | .mwdma_mask = ATA_MWDMA2, |
166 | .udma_mask = ATA_UDMA5, | 165 | .udma_mask = ATA_UDMA5, |
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index edabe6299efd..8baccfef237f 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -440,8 +440,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { | |||
440 | .init_hwif = init_hwif_cmd64x, | 440 | .init_hwif = init_hwif_cmd64x, |
441 | .enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}}, | 441 | .enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}}, |
442 | .host_flags = IDE_HFLAG_CLEAR_SIMPLEX | | 442 | .host_flags = IDE_HFLAG_CLEAR_SIMPLEX | |
443 | IDE_HFLAG_ABUSE_PREFETCH | | 443 | IDE_HFLAG_ABUSE_PREFETCH, |
444 | IDE_HFLAG_BOOTABLE, | ||
445 | .pio_mask = ATA_PIO5, | 444 | .pio_mask = ATA_PIO5, |
446 | .mwdma_mask = ATA_MWDMA2, | 445 | .mwdma_mask = ATA_MWDMA2, |
447 | .udma_mask = 0x00, /* no udma */ | 446 | .udma_mask = 0x00, /* no udma */ |
@@ -451,7 +450,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { | |||
451 | .init_hwif = init_hwif_cmd64x, | 450 | .init_hwif = init_hwif_cmd64x, |
452 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, | 451 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, |
453 | .chipset = ide_cmd646, | 452 | .chipset = ide_cmd646, |
454 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE, | 453 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH, |
455 | .pio_mask = ATA_PIO5, | 454 | .pio_mask = ATA_PIO5, |
456 | .mwdma_mask = ATA_MWDMA2, | 455 | .mwdma_mask = ATA_MWDMA2, |
457 | .udma_mask = ATA_UDMA2, | 456 | .udma_mask = ATA_UDMA2, |
@@ -460,7 +459,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { | |||
460 | .init_chipset = init_chipset_cmd64x, | 459 | .init_chipset = init_chipset_cmd64x, |
461 | .init_hwif = init_hwif_cmd64x, | 460 | .init_hwif = init_hwif_cmd64x, |
462 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, | 461 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, |
463 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE, | 462 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH, |
464 | .pio_mask = ATA_PIO5, | 463 | .pio_mask = ATA_PIO5, |
465 | .mwdma_mask = ATA_MWDMA2, | 464 | .mwdma_mask = ATA_MWDMA2, |
466 | .udma_mask = ATA_UDMA4, | 465 | .udma_mask = ATA_UDMA4, |
@@ -469,7 +468,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { | |||
469 | .init_chipset = init_chipset_cmd64x, | 468 | .init_chipset = init_chipset_cmd64x, |
470 | .init_hwif = init_hwif_cmd64x, | 469 | .init_hwif = init_hwif_cmd64x, |
471 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, | 470 | .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, |
472 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE, | 471 | .host_flags = IDE_HFLAG_ABUSE_PREFETCH, |
473 | .pio_mask = ATA_PIO5, | 472 | .pio_mask = ATA_PIO5, |
474 | .mwdma_mask = ATA_MWDMA2, | 473 | .mwdma_mask = ATA_MWDMA2, |
475 | .udma_mask = ATA_UDMA5, | 474 | .udma_mask = ATA_UDMA5, |
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 1c163e4ef03f..01b37ecb5a5a 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
@@ -122,8 +122,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) | |||
122 | IDE_HFLAG_CS5520 | \ | 122 | IDE_HFLAG_CS5520 | \ |
123 | IDE_HFLAG_VDMA | \ | 123 | IDE_HFLAG_VDMA | \ |
124 | IDE_HFLAG_NO_ATAPI_DMA | \ | 124 | IDE_HFLAG_NO_ATAPI_DMA | \ |
125 | IDE_HFLAG_ABUSE_SET_DMA_MODE |\ | 125 | IDE_HFLAG_ABUSE_SET_DMA_MODE, \ |
126 | IDE_HFLAG_BOOTABLE, \ | ||
127 | .pio_mask = ATA_PIO4, \ | 126 | .pio_mask = ATA_PIO4, \ |
128 | } | 127 | } |
129 | 128 | ||
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index 941a1344820b..56a369c2a78a 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c | |||
@@ -249,8 +249,7 @@ static const struct ide_port_info cs5530_chipset __devinitdata = { | |||
249 | .init_chipset = init_chipset_cs5530, | 249 | .init_chipset = init_chipset_cs5530, |
250 | .init_hwif = init_hwif_cs5530, | 250 | .init_hwif = init_hwif_cs5530, |
251 | .host_flags = IDE_HFLAG_SERIALIZE | | 251 | .host_flags = IDE_HFLAG_SERIALIZE | |
252 | IDE_HFLAG_POST_SET_MODE | | 252 | IDE_HFLAG_POST_SET_MODE, |
253 | IDE_HFLAG_BOOTABLE, | ||
254 | .pio_mask = ATA_PIO4, | 253 | .pio_mask = ATA_PIO4, |
255 | .mwdma_mask = ATA_MWDMA2, | 254 | .mwdma_mask = ATA_MWDMA2, |
256 | .udma_mask = ATA_UDMA2, | 255 | .udma_mask = ATA_UDMA2, |
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index d7b5ea992e94..c9685f239c65 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -186,7 +186,7 @@ static const struct ide_port_info cs5535_chipset __devinitdata = { | |||
186 | .name = "CS5535", | 186 | .name = "CS5535", |
187 | .init_hwif = init_hwif_cs5535, | 187 | .init_hwif = init_hwif_cs5535, |
188 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE | | 188 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE | |
189 | IDE_HFLAG_ABUSE_SET_DMA_MODE | IDE_HFLAG_BOOTABLE, | 189 | IDE_HFLAG_ABUSE_SET_DMA_MODE, |
190 | .pio_mask = ATA_PIO4, | 190 | .pio_mask = ATA_PIO4, |
191 | .mwdma_mask = ATA_MWDMA2, | 191 | .mwdma_mask = ATA_MWDMA2, |
192 | .udma_mask = ATA_UDMA4, | 192 | .udma_mask = ATA_UDMA4, |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 724cbacf4e5b..f68b89a05823 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -410,8 +410,7 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = { | |||
410 | .init_iops = init_iops_cy82c693, | 410 | .init_iops = init_iops_cy82c693, |
411 | .init_hwif = init_hwif_cy82c693, | 411 | .init_hwif = init_hwif_cy82c693, |
412 | .chipset = ide_cy82c693, | 412 | .chipset = ide_cy82c693, |
413 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693 | | 413 | .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693, |
414 | IDE_HFLAG_BOOTABLE, | ||
415 | .pio_mask = ATA_PIO4, | 414 | .pio_mask = ATA_PIO4, |
416 | .swdma_mask = ATA_SWDMA2, | 415 | .swdma_mask = ATA_SWDMA2, |
417 | .mwdma_mask = ATA_MWDMA2, | 416 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 7fd83a9d4dee..f83afa10d3ca 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
@@ -38,8 +38,7 @@ MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE st | |||
38 | { \ | 38 | { \ |
39 | .name = name_str, \ | 39 | .name = name_str, \ |
40 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \ | 40 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \ |
41 | extra_flags | \ | 41 | extra_flags, \ |
42 | IDE_HFLAG_BOOTABLE, \ | ||
43 | .swdma_mask = ATA_SWDMA2, \ | 42 | .swdma_mask = ATA_SWDMA2, \ |
44 | .mwdma_mask = ATA_MWDMA2, \ | 43 | .mwdma_mask = ATA_MWDMA2, \ |
45 | .udma_mask = ATA_UDMA6, \ | 44 | .udma_mask = ATA_UDMA6, \ |
@@ -51,8 +50,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = { | |||
51 | { /* 1 */ | 50 | { /* 1 */ |
52 | .name = "NS87410", | 51 | .name = "NS87410", |
53 | .enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}}, | 52 | .enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}}, |
54 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 53 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, |
55 | IDE_HFLAG_BOOTABLE, | ||
56 | .swdma_mask = ATA_SWDMA2, | 54 | .swdma_mask = ATA_SWDMA2, |
57 | .mwdma_mask = ATA_MWDMA2, | 55 | .mwdma_mask = ATA_MWDMA2, |
58 | .udma_mask = ATA_UDMA6, | 56 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 9f01da46b016..9f2fc3094000 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -133,7 +133,7 @@ static const struct ide_port_info hpt34x_chipsets[] __devinitdata = { | |||
133 | .init_chipset = init_chipset_hpt34x, | 133 | .init_chipset = init_chipset_hpt34x, |
134 | .init_hwif = init_hwif_hpt34x, | 134 | .init_hwif = init_hwif_hpt34x, |
135 | .extra = 16, | 135 | .extra = 16, |
136 | .host_flags = IDE_HFLAGS_HPT34X, | 136 | .host_flags = IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE, |
137 | .pio_mask = ATA_PIO5, | 137 | .pio_mask = ATA_PIO5, |
138 | }, | 138 | }, |
139 | { /* 1 */ | 139 | { /* 1 */ |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 82d0e318a1fe..a49090672145 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -1557,7 +1557,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic | |||
1557 | hpt374_init(dev, dev2); | 1557 | hpt374_init(dev, dev2); |
1558 | else { | 1558 | else { |
1559 | if (hpt36x_init(dev, dev2)) | 1559 | if (hpt36x_init(dev, dev2)) |
1560 | d.host_flags |= IDE_HFLAG_BOOTABLE; | 1560 | d.host_flags &= ~IDE_HFLAG_NON_BOOTABLE; |
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | ret = ide_setup_pci_devices(dev, dev2, &d); | 1563 | ret = ide_setup_pci_devices(dev, dev2, &d); |
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c index e3427eaab430..a5ba7e8b55cc 100644 --- a/drivers/ide/pci/it8213.c +++ b/drivers/ide/pci/it8213.c | |||
@@ -171,8 +171,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif) | |||
171 | .name = name_str, \ | 171 | .name = name_str, \ |
172 | .init_hwif = init_hwif_it8213, \ | 172 | .init_hwif = init_hwif_it8213, \ |
173 | .enablebits = {{0x41,0x80,0x80}}, \ | 173 | .enablebits = {{0x41,0x80,0x80}}, \ |
174 | .host_flags = IDE_HFLAG_SINGLE | \ | 174 | .host_flags = IDE_HFLAG_SINGLE, \ |
175 | IDE_HFLAG_BOOTABLE, \ | ||
176 | .pio_mask = ATA_PIO4, \ | 175 | .pio_mask = ATA_PIO4, \ |
177 | .swdma_mask = ATA_SWDMA2_ONLY, \ | 176 | .swdma_mask = ATA_SWDMA2_ONLY, \ |
178 | .mwdma_mask = ATA_MWDMA12_ONLY, \ | 177 | .mwdma_mask = ATA_MWDMA12_ONLY, \ |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index d8a167451fd6..b9f9e0d78f84 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -623,7 +623,6 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha | |||
623 | .name = name_str, \ | 623 | .name = name_str, \ |
624 | .init_chipset = init_chipset_it821x, \ | 624 | .init_chipset = init_chipset_it821x, \ |
625 | .init_hwif = init_hwif_it821x, \ | 625 | .init_hwif = init_hwif_it821x, \ |
626 | .host_flags = IDE_HFLAG_BOOTABLE, \ | ||
627 | .pio_mask = ATA_PIO4, \ | 626 | .pio_mask = ATA_PIO4, \ |
628 | } | 627 | } |
629 | 628 | ||
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index a56bcb4f22f4..440266fad98e 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -114,7 +114,6 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif) | |||
114 | static const struct ide_port_info jmicron_chipset __devinitdata = { | 114 | static const struct ide_port_info jmicron_chipset __devinitdata = { |
115 | .name = "JMB", | 115 | .name = "JMB", |
116 | .init_hwif = init_hwif_jmicron, | 116 | .init_hwif = init_hwif_jmicron, |
117 | .host_flags = IDE_HFLAG_BOOTABLE, | ||
118 | .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, | 117 | .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, |
119 | .pio_mask = ATA_PIO5, | 118 | .pio_mask = ATA_PIO5, |
120 | .mwdma_mask = ATA_MWDMA2, | 119 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 75513320aad9..3015d6916d4c 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -265,8 +265,7 @@ static const struct ide_port_info ns87415_chipset __devinitdata = { | |||
265 | #endif | 265 | #endif |
266 | .init_hwif = init_hwif_ns87415, | 266 | .init_hwif = init_hwif_ns87415, |
267 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 267 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | |
268 | IDE_HFLAG_NO_ATAPI_DMA | | 268 | IDE_HFLAG_NO_ATAPI_DMA, |
269 | IDE_HFLAG_BOOTABLE, | ||
270 | }; | 269 | }; |
271 | 270 | ||
272 | static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 271 | static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index 46e8748f507e..cfd46ae11428 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c | |||
@@ -335,8 +335,7 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = { | |||
335 | .name = "OPTI621", | 335 | .name = "OPTI621", |
336 | .init_hwif = init_hwif_opti621, | 336 | .init_hwif = init_hwif_opti621, |
337 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, | 337 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, |
338 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 338 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, |
339 | IDE_HFLAG_BOOTABLE, | ||
340 | .pio_mask = ATA_PIO3, | 339 | .pio_mask = ATA_PIO3, |
341 | .swdma_mask = ATA_SWDMA2, | 340 | .swdma_mask = ATA_SWDMA2, |
342 | .mwdma_mask = ATA_MWDMA2, | 341 | .mwdma_mask = ATA_MWDMA2, |
@@ -344,8 +343,7 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = { | |||
344 | .name = "OPTI621X", | 343 | .name = "OPTI621X", |
345 | .init_hwif = init_hwif_opti621, | 344 | .init_hwif = init_hwif_opti621, |
346 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, | 345 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, |
347 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 346 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, |
348 | IDE_HFLAG_BOOTABLE, | ||
349 | .pio_mask = ATA_PIO3, | 347 | .pio_mask = ATA_PIO3, |
350 | .swdma_mask = ATA_SWDMA2, | 348 | .swdma_mask = ATA_SWDMA2, |
351 | .mwdma_mask = ATA_MWDMA2, | 349 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index decef0f47674..89d74ffdb207 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -307,9 +307,9 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif) | |||
307 | } | 307 | } |
308 | 308 | ||
309 | #ifndef CONFIG_IA64 | 309 | #ifndef CONFIG_IA64 |
310 | #define IDE_HFLAGS_PIIX (IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE) | 310 | #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS |
311 | #else | 311 | #else |
312 | #define IDE_HFLAGS_PIIX IDE_HFLAG_BOOTABLE | 312 | #define IDE_HFLAGS_PIIX 0 |
313 | #endif | 313 | #endif |
314 | 314 | ||
315 | #define DECLARE_PIIX_DEV(name_str, udma) \ | 315 | #define DECLARE_PIIX_DEV(name_str, udma) \ |
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c index 51676612f78f..532154adba29 100644 --- a/drivers/ide/pci/rz1000.c +++ b/drivers/ide/pci/rz1000.c | |||
@@ -43,7 +43,7 @@ static const struct ide_port_info rz1000_chipset __devinitdata = { | |||
43 | .name = "RZ100x", | 43 | .name = "RZ100x", |
44 | .init_hwif = init_hwif_rz1000, | 44 | .init_hwif = init_hwif_rz1000, |
45 | .chipset = ide_rz1000, | 45 | .chipset = ide_rz1000, |
46 | .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE, | 46 | .host_flags = IDE_HFLAG_NO_DMA, |
47 | }; | 47 | }; |
48 | 48 | ||
49 | static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 49 | static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 561aa47c7720..44985c8f36e7 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -307,8 +307,7 @@ static const struct ide_port_info sc1200_chipset __devinitdata = { | |||
307 | .init_hwif = init_hwif_sc1200, | 307 | .init_hwif = init_hwif_sc1200, |
308 | .host_flags = IDE_HFLAG_SERIALIZE | | 308 | .host_flags = IDE_HFLAG_SERIALIZE | |
309 | IDE_HFLAG_POST_SET_MODE | | 309 | IDE_HFLAG_POST_SET_MODE | |
310 | IDE_HFLAG_ABUSE_DMA_MODES | | 310 | IDE_HFLAG_ABUSE_DMA_MODES, |
311 | IDE_HFLAG_BOOTABLE, | ||
312 | .pio_mask = ATA_PIO4, | 311 | .pio_mask = ATA_PIO4, |
313 | .mwdma_mask = ATA_MWDMA2, | 312 | .mwdma_mask = ATA_MWDMA2, |
314 | .udma_mask = ATA_UDMA2, | 313 | .udma_mask = ATA_UDMA2, |
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 0d1e4fc86ca6..52145796f12f 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -721,8 +721,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
721 | .name = name_str, \ | 721 | .name = name_str, \ |
722 | .init_iops = init_iops_scc, \ | 722 | .init_iops = init_iops_scc, \ |
723 | .init_hwif = init_hwif_scc, \ | 723 | .init_hwif = init_hwif_scc, \ |
724 | .host_flags = IDE_HFLAG_SINGLE | \ | 724 | .host_flags = IDE_HFLAG_SINGLE, \ |
725 | IDE_HFLAG_BOOTABLE, \ | ||
726 | .pio_mask = ATA_PIO4, \ | 725 | .pio_mask = ATA_PIO4, \ |
727 | } | 726 | } |
728 | 727 | ||
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index c11880b0709f..cfe927469793 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -350,8 +350,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | |||
350 | 350 | ||
351 | #define IDE_HFLAGS_SVWKS \ | 351 | #define IDE_HFLAGS_SVWKS \ |
352 | (IDE_HFLAG_LEGACY_IRQS | \ | 352 | (IDE_HFLAG_LEGACY_IRQS | \ |
353 | IDE_HFLAG_ABUSE_SET_DMA_MODE | \ | 353 | IDE_HFLAG_ABUSE_SET_DMA_MODE) |
354 | IDE_HFLAG_BOOTABLE) | ||
355 | 354 | ||
356 | static const struct ide_port_info serverworks_chipsets[] __devinitdata = { | 355 | static const struct ide_port_info serverworks_chipsets[] __devinitdata = { |
357 | { /* 0 */ | 356 | { /* 0 */ |
@@ -418,7 +417,7 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device | |||
418 | else if (idx == 2 || idx == 3) { | 417 | else if (idx == 2 || idx == 3) { |
419 | if ((PCI_FUNC(dev->devfn) & 1) == 0) { | 418 | if ((PCI_FUNC(dev->devfn) & 1) == 0) { |
420 | if (pci_resource_start(dev, 0) != 0x01f1) | 419 | if (pci_resource_start(dev, 0) != 0x01f1) |
421 | d.host_flags &= ~IDE_HFLAG_BOOTABLE; | 420 | d.host_flags |= IDE_HFLAG_NON_BOOTABLE; |
422 | d.host_flags |= IDE_HFLAG_SINGLE; | 421 | d.host_flags |= IDE_HFLAG_SINGLE; |
423 | } else | 422 | } else |
424 | d.host_flags &= ~IDE_HFLAG_SINGLE; | 423 | d.host_flags &= ~IDE_HFLAG_SINGLE; |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index b6be1b45f329..c9ecab8aeb61 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -808,7 +808,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif) | |||
808 | .init_chipset = init_chipset_siimage, \ | 808 | .init_chipset = init_chipset_siimage, \ |
809 | .init_iops = init_iops_siimage, \ | 809 | .init_iops = init_iops_siimage, \ |
810 | .init_hwif = init_hwif_siimage, \ | 810 | .init_hwif = init_hwif_siimage, \ |
811 | .host_flags = IDE_HFLAG_BOOTABLE, \ | ||
812 | .pio_mask = ATA_PIO4, \ | 811 | .pio_mask = ATA_PIO4, \ |
813 | .mwdma_mask = ATA_MWDMA2, \ | 812 | .mwdma_mask = ATA_MWDMA2, \ |
814 | .udma_mask = ATA_UDMA6, \ | 813 | .udma_mask = ATA_UDMA6, \ |
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 512bb4c1fd5c..e29c90f045d5 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -569,8 +569,7 @@ static const struct ide_port_info sis5513_chipset __devinitdata = { | |||
569 | .init_chipset = init_chipset_sis5513, | 569 | .init_chipset = init_chipset_sis5513, |
570 | .init_hwif = init_hwif_sis5513, | 570 | .init_hwif = init_hwif_sis5513, |
571 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 571 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
572 | .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA | | 572 | .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA, |
573 | IDE_HFLAG_BOOTABLE, | ||
574 | .pio_mask = ATA_PIO4, | 573 | .pio_mask = ATA_PIO4, |
575 | .mwdma_mask = ATA_MWDMA2, | 574 | .mwdma_mask = ATA_MWDMA2, |
576 | }; | 575 | }; |
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 1f00251a4a87..40b3eeb2d847 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -332,8 +332,7 @@ static const struct ide_port_info sl82c105_chipset __devinitdata = { | |||
332 | #if defined(CONFIG_LOPEC) || defined(CONFIG_SANDPOINT) | 332 | #if defined(CONFIG_LOPEC) || defined(CONFIG_SANDPOINT) |
333 | IDE_HFLAG_FORCE_LEGACY_IRQS | | 333 | IDE_HFLAG_FORCE_LEGACY_IRQS | |
334 | #endif | 334 | #endif |
335 | IDE_HFLAG_NO_AUTODMA | | 335 | IDE_HFLAG_NO_AUTODMA, |
336 | IDE_HFLAG_BOOTABLE, | ||
337 | .pio_mask = ATA_PIO5, | 336 | .pio_mask = ATA_PIO5, |
338 | }; | 337 | }; |
339 | 338 | ||
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 65f4c2ffaa59..2ce384ad6caa 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
@@ -137,7 +137,7 @@ static const struct ide_port_info slc90e66_chipset __devinitdata = { | |||
137 | .name = "SLC90E66", | 137 | .name = "SLC90E66", |
138 | .init_hwif = init_hwif_slc90e66, | 138 | .init_hwif = init_hwif_slc90e66, |
139 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, | 139 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, |
140 | .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE, | 140 | .host_flags = IDE_HFLAG_LEGACY_IRQS, |
141 | .pio_mask = ATA_PIO4, | 141 | .pio_mask = ATA_PIO4, |
142 | .swdma_mask = ATA_SWDMA2_ONLY, | 142 | .swdma_mask = ATA_SWDMA2_ONLY, |
143 | .mwdma_mask = ATA_MWDMA12_ONLY, | 143 | .mwdma_mask = ATA_MWDMA12_ONLY, |
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index a67d02a3f96e..3316b197c779 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
@@ -97,7 +97,6 @@ static const struct ide_port_info triflex_device __devinitdata = { | |||
97 | .name = "TRIFLEX", | 97 | .name = "TRIFLEX", |
98 | .init_hwif = init_hwif_triflex, | 98 | .init_hwif = init_hwif_triflex, |
99 | .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, | 99 | .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, |
100 | .host_flags = IDE_HFLAG_BOOTABLE, | ||
101 | .pio_mask = ATA_PIO4, | 100 | .pio_mask = ATA_PIO4, |
102 | .swdma_mask = ATA_SWDMA2, | 101 | .swdma_mask = ATA_SWDMA2, |
103 | .mwdma_mask = ATA_MWDMA2, | 102 | .mwdma_mask = ATA_MWDMA2, |
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index de750f7a43e9..2b8f3a2837d7 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -337,7 +337,6 @@ static const struct ide_port_info trm290_chipset __devinitdata = { | |||
337 | IDE_HFLAG_TRUST_BIOS_FOR_DMA | | 337 | IDE_HFLAG_TRUST_BIOS_FOR_DMA | |
338 | #endif | 338 | #endif |
339 | IDE_HFLAG_NO_AUTODMA | | 339 | IDE_HFLAG_NO_AUTODMA | |
340 | IDE_HFLAG_BOOTABLE | | ||
341 | IDE_HFLAG_NO_LBA48, | 340 | IDE_HFLAG_NO_LBA48, |
342 | }; | 341 | }; |
343 | 342 | ||
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 9004e7521889..b55d2e4d3506 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -432,8 +432,7 @@ static const struct ide_port_info via82cxxx_chipset __devinitdata = { | |||
432 | IDE_HFLAG_PIO_NO_DOWNGRADE | | 432 | IDE_HFLAG_PIO_NO_DOWNGRADE | |
433 | IDE_HFLAG_ABUSE_SET_DMA_MODE | | 433 | IDE_HFLAG_ABUSE_SET_DMA_MODE | |
434 | IDE_HFLAG_POST_SET_MODE | | 434 | IDE_HFLAG_POST_SET_MODE | |
435 | IDE_HFLAG_IO_32BIT | | 435 | IDE_HFLAG_IO_32BIT, |
436 | IDE_HFLAG_BOOTABLE, | ||
437 | .pio_mask = ATA_PIO5, | 436 | .pio_mask = ATA_PIO5, |
438 | .swdma_mask = ATA_SWDMA2, | 437 | .swdma_mask = ATA_SWDMA2, |
439 | .mwdma_mask = ATA_MWDMA2, | 438 | .mwdma_mask = ATA_MWDMA2, |