diff options
| author | Erik Inge Bolsø <knan-lkml@anduin.net> | 2009-03-14 16:38:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2009-03-24 22:13:27 -0400 |
| commit | 14bdef982caeda19afe34010482867c18217c641 (patch) | |
| tree | f1ed0bf1a1dad887ae717a41ccca13332e6fdb17 /drivers/ata/pata_amd.c | |
| parent | 22ddbd1e036ce035c1cccb2496aefafac79aba2c (diff) | |
[libata] convert drivers to use ata.h mode mask defines
No functional changes in this patch.
Signed-off-by: Erik Inge Bolsø <knan-lkml@anduin.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_amd.c')
| -rw-r--r-- | drivers/ata/pata_amd.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 115b1cd6dcf5..33a74f11171c 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
| @@ -455,74 +455,74 @@ static void amd_clear_fifo(struct pci_dev *pdev) | |||
| 455 | static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 455 | static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
| 456 | { | 456 | { |
| 457 | static const struct ata_port_info info[10] = { | 457 | static const struct ata_port_info info[10] = { |
| 458 | { /* 0: AMD 7401 */ | 458 | { /* 0: AMD 7401 - no swdma */ |
| 459 | .flags = ATA_FLAG_SLAVE_POSS, | 459 | .flags = ATA_FLAG_SLAVE_POSS, |
| 460 | .pio_mask = 0x1f, | 460 | .pio_mask = ATA_PIO4, |
| 461 | .mwdma_mask = 0x07, /* No SWDMA */ | 461 | .mwdma_mask = ATA_MWDMA2, |
| 462 | .udma_mask = 0x07, /* UDMA 33 */ | 462 | .udma_mask = ATA_UDMA2, |
| 463 | .port_ops = &amd33_port_ops | 463 | .port_ops = &amd33_port_ops |
| 464 | }, | 464 | }, |
| 465 | { /* 1: Early AMD7409 - no swdma */ | 465 | { /* 1: Early AMD7409 - no swdma */ |
| 466 | .flags = ATA_FLAG_SLAVE_POSS, | 466 | .flags = ATA_FLAG_SLAVE_POSS, |
| 467 | .pio_mask = 0x1f, | 467 | .pio_mask = ATA_PIO4, |
| 468 | .mwdma_mask = 0x07, | 468 | .mwdma_mask = ATA_MWDMA2, |
| 469 | .udma_mask = ATA_UDMA4, /* UDMA 66 */ | 469 | .udma_mask = ATA_UDMA4, |
| 470 | .port_ops = &amd66_port_ops | 470 | .port_ops = &amd66_port_ops |
| 471 | }, | 471 | }, |
| 472 | { /* 2: AMD 7409, no swdma errata */ | 472 | { /* 2: AMD 7409 */ |
| 473 | .flags = ATA_FLAG_SLAVE_POSS, | 473 | .flags = ATA_FLAG_SLAVE_POSS, |
| 474 | .pio_mask = 0x1f, | 474 | .pio_mask = ATA_PIO4, |
| 475 | .mwdma_mask = 0x07, | 475 | .mwdma_mask = ATA_MWDMA2, |
| 476 | .udma_mask = ATA_UDMA4, /* UDMA 66 */ | 476 | .udma_mask = ATA_UDMA4, |
| 477 | .port_ops = &amd66_port_ops | 477 | .port_ops = &amd66_port_ops |
| 478 | }, | 478 | }, |
| 479 | { /* 3: AMD 7411 */ | 479 | { /* 3: AMD 7411 */ |
| 480 | .flags = ATA_FLAG_SLAVE_POSS, | 480 | .flags = ATA_FLAG_SLAVE_POSS, |
| 481 | .pio_mask = 0x1f, | 481 | .pio_mask = ATA_PIO4, |
| 482 | .mwdma_mask = 0x07, | 482 | .mwdma_mask = ATA_MWDMA2, |
| 483 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ | 483 | .udma_mask = ATA_UDMA5, |
| 484 | .port_ops = &amd100_port_ops | 484 | .port_ops = &amd100_port_ops |
| 485 | }, | 485 | }, |
| 486 | { /* 4: AMD 7441 */ | 486 | { /* 4: AMD 7441 */ |
| 487 | .flags = ATA_FLAG_SLAVE_POSS, | 487 | .flags = ATA_FLAG_SLAVE_POSS, |
| 488 | .pio_mask = 0x1f, | 488 | .pio_mask = ATA_PIO4, |
| 489 | .mwdma_mask = 0x07, | 489 | .mwdma_mask = ATA_MWDMA2, |
| 490 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ | 490 | .udma_mask = ATA_UDMA5, |
| 491 | .port_ops = &amd100_port_ops | 491 | .port_ops = &amd100_port_ops |
| 492 | }, | 492 | }, |
| 493 | { /* 5: AMD 8111*/ | 493 | { /* 5: AMD 8111 - no swdma */ |
| 494 | .flags = ATA_FLAG_SLAVE_POSS, | 494 | .flags = ATA_FLAG_SLAVE_POSS, |
| 495 | .pio_mask = 0x1f, | 495 | .pio_mask = ATA_PIO4, |
| 496 | .mwdma_mask = 0x07, | 496 | .mwdma_mask = ATA_MWDMA2, |
| 497 | .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */ | 497 | .udma_mask = ATA_UDMA6, |
| 498 | .port_ops = &amd133_port_ops | 498 | .port_ops = &amd133_port_ops |
| 499 | }, | 499 | }, |
| 500 | { /* 6: AMD 8111 UDMA 100 (Serenade) */ | 500 | { /* 6: AMD 8111 UDMA 100 (Serenade) - no swdma */ |
| 501 | .flags = ATA_FLAG_SLAVE_POSS, | 501 | .flags = ATA_FLAG_SLAVE_POSS, |
| 502 | .pio_mask = 0x1f, | 502 | .pio_mask = ATA_PIO4, |
| 503 | .mwdma_mask = 0x07, | 503 | .mwdma_mask = ATA_MWDMA2, |
| 504 | .udma_mask = ATA_UDMA5, /* UDMA 100, no swdma */ | 504 | .udma_mask = ATA_UDMA5, |
| 505 | .port_ops = &amd133_port_ops | 505 | .port_ops = &amd133_port_ops |
| 506 | }, | 506 | }, |
| 507 | { /* 7: Nvidia Nforce */ | 507 | { /* 7: Nvidia Nforce */ |
| 508 | .flags = ATA_FLAG_SLAVE_POSS, | 508 | .flags = ATA_FLAG_SLAVE_POSS, |
| 509 | .pio_mask = 0x1f, | 509 | .pio_mask = ATA_PIO4, |
| 510 | .mwdma_mask = 0x07, | 510 | .mwdma_mask = ATA_MWDMA2, |
| 511 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ | 511 | .udma_mask = ATA_UDMA5, |
| 512 | .port_ops = &nv100_port_ops | 512 | .port_ops = &nv100_port_ops |
| 513 | }, | 513 | }, |
| 514 | { /* 8: Nvidia Nforce2 and later */ | 514 | { /* 8: Nvidia Nforce2 and later - no swdma */ |
| 515 | .flags = ATA_FLAG_SLAVE_POSS, | 515 | .flags = ATA_FLAG_SLAVE_POSS, |
| 516 | .pio_mask = 0x1f, | 516 | .pio_mask = ATA_PIO4, |
| 517 | .mwdma_mask = 0x07, | 517 | .mwdma_mask = ATA_MWDMA2, |
| 518 | .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */ | 518 | .udma_mask = ATA_UDMA6, |
| 519 | .port_ops = &nv133_port_ops | 519 | .port_ops = &nv133_port_ops |
| 520 | }, | 520 | }, |
| 521 | { /* 9: AMD CS5536 (Geode companion) */ | 521 | { /* 9: AMD CS5536 (Geode companion) */ |
| 522 | .flags = ATA_FLAG_SLAVE_POSS, | 522 | .flags = ATA_FLAG_SLAVE_POSS, |
| 523 | .pio_mask = 0x1f, | 523 | .pio_mask = ATA_PIO4, |
| 524 | .mwdma_mask = 0x07, | 524 | .mwdma_mask = ATA_MWDMA2, |
| 525 | .udma_mask = ATA_UDMA5, /* UDMA 100 */ | 525 | .udma_mask = ATA_UDMA5, |
| 526 | .port_ops = &amd100_port_ops | 526 | .port_ops = &amd100_port_ops |
| 527 | } | 527 | } |
| 528 | }; | 528 | }; |