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_cmd64x.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_cmd64x.c')
| -rw-r--r-- | drivers/ata/pata_cmd64x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 320a5b10aa98..dc443e7dc37c 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
| @@ -380,21 +380,21 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 380 | static const struct ata_port_info cmd_info[6] = { | 380 | static const struct ata_port_info cmd_info[6] = { |
| 381 | { /* CMD 643 - no UDMA */ | 381 | { /* CMD 643 - no UDMA */ |
| 382 | .sht = &cmd64x_sht, | 382 | .sht = &cmd64x_sht, |
| 383 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 383 | .flags = ATA_FLAG_SLAVE_POSS, |
| 384 | .pio_mask = 0x1f, | 384 | .pio_mask = 0x1f, |
| 385 | .mwdma_mask = 0x07, | 385 | .mwdma_mask = 0x07, |
| 386 | .port_ops = &cmd64x_port_ops | 386 | .port_ops = &cmd64x_port_ops |
| 387 | }, | 387 | }, |
| 388 | { /* CMD 646 with broken UDMA */ | 388 | { /* CMD 646 with broken UDMA */ |
| 389 | .sht = &cmd64x_sht, | 389 | .sht = &cmd64x_sht, |
| 390 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 390 | .flags = ATA_FLAG_SLAVE_POSS, |
| 391 | .pio_mask = 0x1f, | 391 | .pio_mask = 0x1f, |
| 392 | .mwdma_mask = 0x07, | 392 | .mwdma_mask = 0x07, |
| 393 | .port_ops = &cmd64x_port_ops | 393 | .port_ops = &cmd64x_port_ops |
| 394 | }, | 394 | }, |
| 395 | { /* CMD 646 with working UDMA */ | 395 | { /* CMD 646 with working UDMA */ |
| 396 | .sht = &cmd64x_sht, | 396 | .sht = &cmd64x_sht, |
| 397 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 397 | .flags = ATA_FLAG_SLAVE_POSS, |
| 398 | .pio_mask = 0x1f, | 398 | .pio_mask = 0x1f, |
| 399 | .mwdma_mask = 0x07, | 399 | .mwdma_mask = 0x07, |
| 400 | .udma_mask = ATA_UDMA1, | 400 | .udma_mask = ATA_UDMA1, |
| @@ -402,14 +402,14 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 402 | }, | 402 | }, |
| 403 | { /* CMD 646 rev 1 */ | 403 | { /* CMD 646 rev 1 */ |
| 404 | .sht = &cmd64x_sht, | 404 | .sht = &cmd64x_sht, |
| 405 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 405 | .flags = ATA_FLAG_SLAVE_POSS, |
| 406 | .pio_mask = 0x1f, | 406 | .pio_mask = 0x1f, |
| 407 | .mwdma_mask = 0x07, | 407 | .mwdma_mask = 0x07, |
| 408 | .port_ops = &cmd646r1_port_ops | 408 | .port_ops = &cmd646r1_port_ops |
| 409 | }, | 409 | }, |
| 410 | { /* CMD 648 */ | 410 | { /* CMD 648 */ |
| 411 | .sht = &cmd64x_sht, | 411 | .sht = &cmd64x_sht, |
| 412 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 412 | .flags = ATA_FLAG_SLAVE_POSS, |
| 413 | .pio_mask = 0x1f, | 413 | .pio_mask = 0x1f, |
| 414 | .mwdma_mask = 0x07, | 414 | .mwdma_mask = 0x07, |
| 415 | .udma_mask = ATA_UDMA2, | 415 | .udma_mask = ATA_UDMA2, |
| @@ -417,7 +417,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 417 | }, | 417 | }, |
| 418 | { /* CMD 649 */ | 418 | { /* CMD 649 */ |
| 419 | .sht = &cmd64x_sht, | 419 | .sht = &cmd64x_sht, |
| 420 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 420 | .flags = ATA_FLAG_SLAVE_POSS, |
| 421 | .pio_mask = 0x1f, | 421 | .pio_mask = 0x1f, |
| 422 | .mwdma_mask = 0x07, | 422 | .mwdma_mask = 0x07, |
| 423 | .udma_mask = ATA_UDMA3, | 423 | .udma_mask = ATA_UDMA3, |