diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 08:18:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 10:24:59 +0100 |
| commit | 22cabc2619a58d3e5f95bb8df823da535e103bf4 (patch) | |
| tree | adf806dc3823f45174f193ed51fd5b51dad65e8f /drivers/ide/cmd64x.c | |
| parent | cmd64x: fix PIO and MWDMA timings calculations (diff) | |
| download | linux-22cabc2619a58d3e5f95bb8df823da535e103bf4.tar.xz linux-22cabc2619a58d3e5f95bb8df823da535e103bf4.zip | |
cmd64x: remove superfluous checks from cmd64x_set_dma_mode()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/ide/cmd64x.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index 5c5dd90d032b..9f89f3116df0 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c @@ -146,10 +146,8 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) u8 unit = drive->dn & 0x01; u8 regU = 0, pciU = hwif->channel ? UDIDETCR1 : UDIDETCR0; - if (speed >= XFER_SW_DMA_0) { - (void) pci_read_config_byte(dev, pciU, ®U); - regU &= ~(unit ? 0xCA : 0x35); - } + pci_read_config_byte(dev, pciU, ®U); + regU &= ~(unit ? 0xCA : 0x35); switch(speed) { case XFER_UDMA_5: @@ -177,8 +175,7 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) break; } - if (speed >= XFER_SW_DMA_0) - (void) pci_write_config_byte(dev, pciU, regU); + pci_write_config_byte(dev, pciU, regU); } static void cmd648_clear_irq(ide_drive_t *drive) |