Skip to content

Commit

Permalink
cmd64x: remove superfluous checks from cmd64x_set_dma_mode()
Browse files Browse the repository at this point in the history 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and David S. Miller committed Jan 19, 2010
1 parent 60349ab commit 22cabc2
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/ide/cmd64x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, &regU);
regU &= ~(unit ? 0xCA : 0x35);
}
pci_read_config_byte(dev, pciU, &regU);
regU &= ~(unit ? 0xCA : 0x35);

switch(speed) {
case XFER_UDMA_5:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 22cabc2

Please sign in to comment.