diff options
-rw-r--r-- | drivers/ata/ahci.c | 10 | ||||
-rw-r--r-- | drivers/ata/sata_promise.c | 14 | ||||
-rw-r--r-- | drivers/ata/sata_sx4.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index b14e7ef343f3..f66e2a50158b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -330,14 +330,14 @@ static const struct ata_port_info ahci_port_info[] = { | |||
330 | { | 330 | { |
331 | .flags = AHCI_FLAG_COMMON, | 331 | .flags = AHCI_FLAG_COMMON, |
332 | .pio_mask = 0x1f, /* pio0-4 */ | 332 | .pio_mask = 0x1f, /* pio0-4 */ |
333 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 333 | .udma_mask = ATA_UDMA6, |
334 | .port_ops = &ahci_ops, | 334 | .port_ops = &ahci_ops, |
335 | }, | 335 | }, |
336 | /* board_ahci_pi */ | 336 | /* board_ahci_pi */ |
337 | { | 337 | { |
338 | .flags = AHCI_FLAG_COMMON | AHCI_FLAG_HONOR_PI, | 338 | .flags = AHCI_FLAG_COMMON | AHCI_FLAG_HONOR_PI, |
339 | .pio_mask = 0x1f, /* pio0-4 */ | 339 | .pio_mask = 0x1f, /* pio0-4 */ |
340 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 340 | .udma_mask = ATA_UDMA6, |
341 | .port_ops = &ahci_ops, | 341 | .port_ops = &ahci_ops, |
342 | }, | 342 | }, |
343 | /* board_ahci_vt8251 */ | 343 | /* board_ahci_vt8251 */ |
@@ -345,14 +345,14 @@ static const struct ata_port_info ahci_port_info[] = { | |||
345 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_HRST_TO_RESUME | | 345 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_HRST_TO_RESUME | |
346 | AHCI_FLAG_NO_NCQ, | 346 | AHCI_FLAG_NO_NCQ, |
347 | .pio_mask = 0x1f, /* pio0-4 */ | 347 | .pio_mask = 0x1f, /* pio0-4 */ |
348 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 348 | .udma_mask = ATA_UDMA6, |
349 | .port_ops = &ahci_vt8251_ops, | 349 | .port_ops = &ahci_vt8251_ops, |
350 | }, | 350 | }, |
351 | /* board_ahci_ign_iferr */ | 351 | /* board_ahci_ign_iferr */ |
352 | { | 352 | { |
353 | .flags = AHCI_FLAG_COMMON | AHCI_FLAG_IGN_IRQ_IF_ERR, | 353 | .flags = AHCI_FLAG_COMMON | AHCI_FLAG_IGN_IRQ_IF_ERR, |
354 | .pio_mask = 0x1f, /* pio0-4 */ | 354 | .pio_mask = 0x1f, /* pio0-4 */ |
355 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 355 | .udma_mask = ATA_UDMA6, |
356 | .port_ops = &ahci_ops, | 356 | .port_ops = &ahci_ops, |
357 | }, | 357 | }, |
358 | /* board_ahci_sb600 */ | 358 | /* board_ahci_sb600 */ |
@@ -361,7 +361,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
361 | AHCI_FLAG_IGN_SERR_INTERNAL | | 361 | AHCI_FLAG_IGN_SERR_INTERNAL | |
362 | AHCI_FLAG_32BIT_ONLY, | 362 | AHCI_FLAG_32BIT_ONLY, |
363 | .pio_mask = 0x1f, /* pio0-4 */ | 363 | .pio_mask = 0x1f, /* pio0-4 */ |
364 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 364 | .udma_mask = ATA_UDMA6, |
365 | .port_ops = &ahci_ops, | 365 | .port_ops = &ahci_ops, |
366 | }, | 366 | }, |
367 | }; | 367 | }; |
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 78bdfd00b218..2ad5872fe90c 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -250,7 +250,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
250 | PDC_FLAG_SATA_PATA, | 250 | PDC_FLAG_SATA_PATA, |
251 | .pio_mask = 0x1f, /* pio0-4 */ | 251 | .pio_mask = 0x1f, /* pio0-4 */ |
252 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 252 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
253 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 253 | .udma_mask = ATA_UDMA6, |
254 | .port_ops = &pdc_old_sata_ops, | 254 | .port_ops = &pdc_old_sata_ops, |
255 | }, | 255 | }, |
256 | 256 | ||
@@ -259,7 +259,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
259 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, | 259 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, |
260 | .pio_mask = 0x1f, /* pio0-4 */ | 260 | .pio_mask = 0x1f, /* pio0-4 */ |
261 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 261 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
262 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 262 | .udma_mask = ATA_UDMA6, |
263 | .port_ops = &pdc_pata_ops, | 263 | .port_ops = &pdc_pata_ops, |
264 | }, | 264 | }, |
265 | 265 | ||
@@ -269,7 +269,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
269 | PDC_FLAG_4_PORTS, | 269 | PDC_FLAG_4_PORTS, |
270 | .pio_mask = 0x1f, /* pio0-4 */ | 270 | .pio_mask = 0x1f, /* pio0-4 */ |
271 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 271 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
272 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 272 | .udma_mask = ATA_UDMA6, |
273 | .port_ops = &pdc_old_sata_ops, | 273 | .port_ops = &pdc_old_sata_ops, |
274 | }, | 274 | }, |
275 | 275 | ||
@@ -279,7 +279,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
279 | PDC_FLAG_4_PORTS, | 279 | PDC_FLAG_4_PORTS, |
280 | .pio_mask = 0x1f, /* pio0-4 */ | 280 | .pio_mask = 0x1f, /* pio0-4 */ |
281 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 281 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
282 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 282 | .udma_mask = ATA_UDMA6, |
283 | .port_ops = &pdc_pata_ops, | 283 | .port_ops = &pdc_pata_ops, |
284 | }, | 284 | }, |
285 | 285 | ||
@@ -289,7 +289,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
289 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, | 289 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, |
290 | .pio_mask = 0x1f, /* pio0-4 */ | 290 | .pio_mask = 0x1f, /* pio0-4 */ |
291 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 291 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
292 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 292 | .udma_mask = ATA_UDMA6, |
293 | .port_ops = &pdc_sata_ops, | 293 | .port_ops = &pdc_sata_ops, |
294 | }, | 294 | }, |
295 | 295 | ||
@@ -299,7 +299,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
299 | PDC_FLAG_GEN_II, | 299 | PDC_FLAG_GEN_II, |
300 | .pio_mask = 0x1f, /* pio0-4 */ | 300 | .pio_mask = 0x1f, /* pio0-4 */ |
301 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 301 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
302 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 302 | .udma_mask = ATA_UDMA6, |
303 | .port_ops = &pdc_pata_ops, | 303 | .port_ops = &pdc_pata_ops, |
304 | }, | 304 | }, |
305 | 305 | ||
@@ -309,7 +309,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
309 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, | 309 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, |
310 | .pio_mask = 0x1f, /* pio0-4 */ | 310 | .pio_mask = 0x1f, /* pio0-4 */ |
311 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 311 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
312 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 312 | .udma_mask = ATA_UDMA6, |
313 | .port_ops = &pdc_sata_ops, | 313 | .port_ops = &pdc_sata_ops, |
314 | }, | 314 | }, |
315 | }; | 315 | }; |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 3d83ee273388..5193bd8647ba 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -279,7 +279,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
279 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING, | 279 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING, |
280 | .pio_mask = 0x1f, /* pio0-4 */ | 280 | .pio_mask = 0x1f, /* pio0-4 */ |
281 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 281 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
282 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 282 | .udma_mask = ATA_UDMA6, |
283 | .port_ops = &pdc_20621_ops, | 283 | .port_ops = &pdc_20621_ops, |
284 | }, | 284 | }, |
285 | 285 | ||