diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 15:17:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 15:17:03 -0400 |
| commit | 9ccb1aa16cef6316831fef61e4aeaa3784035cb8 (patch) | |
| tree | ff6d41695b8d715c9a96e2cd5674cf7da398ea51 | |
| parent | 064e38aaded5269e573ac1c765284fd65c8ebd13 (diff) | |
| parent | a3cb900cc408977a11519bc7c760f3e499079589 (diff) | |
Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_ali: Use IGN_SIMPLEX
| -rw-r--r-- | drivers/ata/pata_ali.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 751b7ea4816c..fc9c5d6d7d80 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
| @@ -497,14 +497,16 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 497 | }; | 497 | }; |
| 498 | /* Revision 0x20 added DMA */ | 498 | /* Revision 0x20 added DMA */ |
| 499 | static const struct ata_port_info info_20 = { | 499 | static const struct ata_port_info info_20 = { |
| 500 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 500 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 | |
| 501 | ATA_FLAG_IGN_SIMPLEX, | ||
| 501 | .pio_mask = ATA_PIO4, | 502 | .pio_mask = ATA_PIO4, |
| 502 | .mwdma_mask = ATA_MWDMA2, | 503 | .mwdma_mask = ATA_MWDMA2, |
| 503 | .port_ops = &ali_20_port_ops | 504 | .port_ops = &ali_20_port_ops |
| 504 | }; | 505 | }; |
| 505 | /* Revision 0x20 with support logic added UDMA */ | 506 | /* Revision 0x20 with support logic added UDMA */ |
| 506 | static const struct ata_port_info info_20_udma = { | 507 | static const struct ata_port_info info_20_udma = { |
| 507 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 508 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 | |
| 509 | ATA_FLAG_IGN_SIMPLEX, | ||
| 508 | .pio_mask = ATA_PIO4, | 510 | .pio_mask = ATA_PIO4, |
| 509 | .mwdma_mask = ATA_MWDMA2, | 511 | .mwdma_mask = ATA_MWDMA2, |
| 510 | .udma_mask = ATA_UDMA2, | 512 | .udma_mask = ATA_UDMA2, |
| @@ -512,7 +514,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 512 | }; | 514 | }; |
| 513 | /* Revision 0xC2 adds UDMA66 */ | 515 | /* Revision 0xC2 adds UDMA66 */ |
| 514 | static const struct ata_port_info info_c2 = { | 516 | static const struct ata_port_info info_c2 = { |
| 515 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 517 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 | |
| 518 | ATA_FLAG_IGN_SIMPLEX, | ||
| 516 | .pio_mask = ATA_PIO4, | 519 | .pio_mask = ATA_PIO4, |
| 517 | .mwdma_mask = ATA_MWDMA2, | 520 | .mwdma_mask = ATA_MWDMA2, |
| 518 | .udma_mask = ATA_UDMA4, | 521 | .udma_mask = ATA_UDMA4, |
| @@ -520,7 +523,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 520 | }; | 523 | }; |
| 521 | /* Revision 0xC3 is UDMA66 for now */ | 524 | /* Revision 0xC3 is UDMA66 for now */ |
| 522 | static const struct ata_port_info info_c3 = { | 525 | static const struct ata_port_info info_c3 = { |
| 523 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 526 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 | |
| 527 | ATA_FLAG_IGN_SIMPLEX, | ||
| 524 | .pio_mask = ATA_PIO4, | 528 | .pio_mask = ATA_PIO4, |
| 525 | .mwdma_mask = ATA_MWDMA2, | 529 | .mwdma_mask = ATA_MWDMA2, |
| 526 | .udma_mask = ATA_UDMA4, | 530 | .udma_mask = ATA_UDMA4, |
| @@ -528,7 +532,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 528 | }; | 532 | }; |
| 529 | /* Revision 0xC4 is UDMA100 */ | 533 | /* Revision 0xC4 is UDMA100 */ |
| 530 | static const struct ata_port_info info_c4 = { | 534 | static const struct ata_port_info info_c4 = { |
| 531 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48, | 535 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 | |
| 536 | ATA_FLAG_IGN_SIMPLEX, | ||
| 532 | .pio_mask = ATA_PIO4, | 537 | .pio_mask = ATA_PIO4, |
| 533 | .mwdma_mask = ATA_MWDMA2, | 538 | .mwdma_mask = ATA_MWDMA2, |
| 534 | .udma_mask = ATA_UDMA5, | 539 | .udma_mask = ATA_UDMA5, |
| @@ -536,7 +541,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 536 | }; | 541 | }; |
| 537 | /* Revision 0xC5 is UDMA133 with LBA48 DMA */ | 542 | /* Revision 0xC5 is UDMA133 with LBA48 DMA */ |
| 538 | static const struct ata_port_info info_c5 = { | 543 | static const struct ata_port_info info_c5 = { |
| 539 | .flags = ATA_FLAG_SLAVE_POSS, | 544 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_IGN_SIMPLEX, |
| 540 | .pio_mask = ATA_PIO4, | 545 | .pio_mask = ATA_PIO4, |
| 541 | .mwdma_mask = ATA_MWDMA2, | 546 | .mwdma_mask = ATA_MWDMA2, |
| 542 | .udma_mask = ATA_UDMA6, | 547 | .udma_mask = ATA_UDMA6, |