diff options
| -rw-r--r-- | drivers/ata/pata_atp867x.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c index 7990de925d2e..ebfc8ff86519 100644 --- a/drivers/ata/pata_atp867x.c +++ b/drivers/ata/pata_atp867x.c | |||
| @@ -118,20 +118,13 @@ struct atp867x_priv { | |||
| 118 | int pci66mhz; | 118 | int pci66mhz; |
| 119 | }; | 119 | }; |
| 120 | 120 | ||
| 121 | static inline u8 atp867x_speed_to_mode(u8 speed) | ||
| 122 | { | ||
| 123 | return speed - XFER_UDMA_0 + 1; | ||
| 124 | } | ||
| 125 | |||
| 126 | static void atp867x_set_dmamode(struct ata_port *ap, struct ata_device *adev) | 121 | static void atp867x_set_dmamode(struct ata_port *ap, struct ata_device *adev) |
| 127 | { | 122 | { |
| 128 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 123 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
| 129 | struct atp867x_priv *dp = ap->private_data; | 124 | struct atp867x_priv *dp = ap->private_data; |
| 130 | u8 speed = adev->dma_mode; | 125 | u8 speed = adev->dma_mode; |
| 131 | u8 b; | 126 | u8 b; |
| 132 | u8 mode; | 127 | u8 mode = speed - XFER_UDMA_0 + 1; |
| 133 | |||
| 134 | mode = atp867x_speed_to_mode(speed); | ||
| 135 | 128 | ||
| 136 | /* | 129 | /* |
| 137 | * Doc 6.6.9: decrease the udma mode value by 1 for safer UDMA speed | 130 | * Doc 6.6.9: decrease the udma mode value by 1 for safer UDMA speed |
| @@ -471,7 +464,6 @@ static int atp867x_init_one(struct pci_dev *pdev, | |||
| 471 | static const struct ata_port_info info_867x = { | 464 | static const struct ata_port_info info_867x = { |
| 472 | .flags = ATA_FLAG_SLAVE_POSS, | 465 | .flags = ATA_FLAG_SLAVE_POSS, |
| 473 | .pio_mask = ATA_PIO4, | 466 | .pio_mask = ATA_PIO4, |
| 474 | .mwdma_mask = ATA_MWDMA2, | ||
| 475 | .udma_mask = ATA_UDMA6, | 467 | .udma_mask = ATA_UDMA6, |
| 476 | .port_ops = &atp867x_ops, | 468 | .port_ops = &atp867x_ops, |
| 477 | }; | 469 | }; |
