diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-05-28 06:59:48 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-09 12:17:32 -0400 |
commit | 1d2808fd3d2d5d2c0483796a0f443d1cb3f11367 (patch) | |
tree | dd7ee6c539cf5c2a31344d526e248d3a9f379d31 /drivers/ata/pata_amd.c | |
parent | 5bcd7a00a464fd81b4b68847b9b811a635a15b61 (diff) |
[libata] PATA drivers: remove ATA_FLAG_SRST
This flag only has meaning in old-EH drivers, and these drivers have
already been converted to the new EH. Remove.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index a16f629b7b38..533bcc9d1542 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -541,7 +541,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
541 | static const struct ata_port_info info[10] = { | 541 | static const struct ata_port_info info[10] = { |
542 | { /* 0: AMD 7401 */ | 542 | { /* 0: AMD 7401 */ |
543 | .sht = &amd_sht, | 543 | .sht = &amd_sht, |
544 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 544 | .flags = ATA_FLAG_SLAVE_POSS, |
545 | .pio_mask = 0x1f, | 545 | .pio_mask = 0x1f, |
546 | .mwdma_mask = 0x07, /* No SWDMA */ | 546 | .mwdma_mask = 0x07, /* No SWDMA */ |
547 | .udma_mask = 0x07, /* UDMA 33 */ | 547 | .udma_mask = 0x07, /* UDMA 33 */ |
@@ -549,7 +549,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
549 | }, | 549 | }, |
550 | { /* 1: Early AMD7409 - no swdma */ | 550 | { /* 1: Early AMD7409 - no swdma */ |
551 | .sht = &amd_sht, | 551 | .sht = &amd_sht, |
552 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 552 | .flags = ATA_FLAG_SLAVE_POSS, |
553 | .pio_mask = 0x1f, | 553 | .pio_mask = 0x1f, |
554 | .mwdma_mask = 0x07, | 554 | .mwdma_mask = 0x07, |
555 | .udma_mask = 0x1f, /* UDMA 66 */ | 555 | .udma_mask = 0x1f, /* UDMA 66 */ |
@@ -557,7 +557,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
557 | }, | 557 | }, |
558 | { /* 2: AMD 7409, no swdma errata */ | 558 | { /* 2: AMD 7409, no swdma errata */ |
559 | .sht = &amd_sht, | 559 | .sht = &amd_sht, |
560 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 560 | .flags = ATA_FLAG_SLAVE_POSS, |
561 | .pio_mask = 0x1f, | 561 | .pio_mask = 0x1f, |
562 | .mwdma_mask = 0x07, | 562 | .mwdma_mask = 0x07, |
563 | .udma_mask = 0x1f, /* UDMA 66 */ | 563 | .udma_mask = 0x1f, /* UDMA 66 */ |
@@ -565,7 +565,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
565 | }, | 565 | }, |
566 | { /* 3: AMD 7411 */ | 566 | { /* 3: AMD 7411 */ |
567 | .sht = &amd_sht, | 567 | .sht = &amd_sht, |
568 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 568 | .flags = ATA_FLAG_SLAVE_POSS, |
569 | .pio_mask = 0x1f, | 569 | .pio_mask = 0x1f, |
570 | .mwdma_mask = 0x07, | 570 | .mwdma_mask = 0x07, |
571 | .udma_mask = 0x3f, /* UDMA 100 */ | 571 | .udma_mask = 0x3f, /* UDMA 100 */ |
@@ -573,7 +573,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
573 | }, | 573 | }, |
574 | { /* 4: AMD 7441 */ | 574 | { /* 4: AMD 7441 */ |
575 | .sht = &amd_sht, | 575 | .sht = &amd_sht, |
576 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 576 | .flags = ATA_FLAG_SLAVE_POSS, |
577 | .pio_mask = 0x1f, | 577 | .pio_mask = 0x1f, |
578 | .mwdma_mask = 0x07, | 578 | .mwdma_mask = 0x07, |
579 | .udma_mask = 0x3f, /* UDMA 100 */ | 579 | .udma_mask = 0x3f, /* UDMA 100 */ |
@@ -581,7 +581,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
581 | }, | 581 | }, |
582 | { /* 5: AMD 8111*/ | 582 | { /* 5: AMD 8111*/ |
583 | .sht = &amd_sht, | 583 | .sht = &amd_sht, |
584 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 584 | .flags = ATA_FLAG_SLAVE_POSS, |
585 | .pio_mask = 0x1f, | 585 | .pio_mask = 0x1f, |
586 | .mwdma_mask = 0x07, | 586 | .mwdma_mask = 0x07, |
587 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ | 587 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ |
@@ -589,7 +589,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
589 | }, | 589 | }, |
590 | { /* 6: AMD 8111 UDMA 100 (Serenade) */ | 590 | { /* 6: AMD 8111 UDMA 100 (Serenade) */ |
591 | .sht = &amd_sht, | 591 | .sht = &amd_sht, |
592 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 592 | .flags = ATA_FLAG_SLAVE_POSS, |
593 | .pio_mask = 0x1f, | 593 | .pio_mask = 0x1f, |
594 | .mwdma_mask = 0x07, | 594 | .mwdma_mask = 0x07, |
595 | .udma_mask = 0x3f, /* UDMA 100, no swdma */ | 595 | .udma_mask = 0x3f, /* UDMA 100, no swdma */ |
@@ -597,7 +597,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
597 | }, | 597 | }, |
598 | { /* 7: Nvidia Nforce */ | 598 | { /* 7: Nvidia Nforce */ |
599 | .sht = &amd_sht, | 599 | .sht = &amd_sht, |
600 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 600 | .flags = ATA_FLAG_SLAVE_POSS, |
601 | .pio_mask = 0x1f, | 601 | .pio_mask = 0x1f, |
602 | .mwdma_mask = 0x07, | 602 | .mwdma_mask = 0x07, |
603 | .udma_mask = 0x3f, /* UDMA 100 */ | 603 | .udma_mask = 0x3f, /* UDMA 100 */ |
@@ -605,7 +605,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
605 | }, | 605 | }, |
606 | { /* 8: Nvidia Nforce2 and later */ | 606 | { /* 8: Nvidia Nforce2 and later */ |
607 | .sht = &amd_sht, | 607 | .sht = &amd_sht, |
608 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 608 | .flags = ATA_FLAG_SLAVE_POSS, |
609 | .pio_mask = 0x1f, | 609 | .pio_mask = 0x1f, |
610 | .mwdma_mask = 0x07, | 610 | .mwdma_mask = 0x07, |
611 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ | 611 | .udma_mask = 0x7f, /* UDMA 133, no swdma */ |
@@ -613,7 +613,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
613 | }, | 613 | }, |
614 | { /* 9: AMD CS5536 (Geode companion) */ | 614 | { /* 9: AMD CS5536 (Geode companion) */ |
615 | .sht = &amd_sht, | 615 | .sht = &amd_sht, |
616 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 616 | .flags = ATA_FLAG_SLAVE_POSS, |
617 | .pio_mask = 0x1f, | 617 | .pio_mask = 0x1f, |
618 | .mwdma_mask = 0x07, | 618 | .mwdma_mask = 0x07, |
619 | .udma_mask = 0x3f, /* UDMA 100 */ | 619 | .udma_mask = 0x3f, /* UDMA 100 */ |