From: Bartlomiej Zolnierkiewicz Date: Sat, 13 Oct 2007 15:47:49 +0000 (+0200) Subject: ide-pmac: remove control register messing from pmac_ide_dma_check() X-Git-Tag: v2.6.24-rc1~1363^2~21 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78103940e4f8084de2bf8ca81c4bd09b48e9ac16;p=linux-2.6 ide-pmac: remove control register messing from pmac_ide_dma_check() pmac_ide_do_setfeature() contains matching nIEN setting/clearing so this Device Control register messing in pmac_ide_dma_check() is totally unnecessary. Cc: Benjamin Herrenschmidt Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index b24e905ddc..d6a1a9be58 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1784,7 +1784,7 @@ pmac_ide_dma_check(ide_drive_t *drive) drive->using_dma = pmac_ide_udma_enable(drive, mode); else if (mode >= XFER_MW_DMA_0) drive->using_dma = pmac_ide_mdma_enable(drive, mode); - hwif->OUTB(0, IDE_CONTROL_REG); + /* Apply settings to controller */ pmac_ide_do_update_timings(drive); }