From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 25 Jan 2008 21:17:19 +0000 (+0100)
Subject: ide: remove redundant ->ide_dma_on call from set_using_dma()
X-Git-Tag: v2.6.25-rc1~1236^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23b1bd459c9e8a925381960f0b69ac85468c3af1;p=linux-2.6

ide: remove redundant ->ide_dma_on call from set_using_dma()

ide_set_dma() calls ->ide_dma_on method itself and returns zero
only if ->ide_dma_on call succeeded.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 4acd87e92c..00ef6ec2c2 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -852,7 +852,7 @@ int set_using_dma(ide_drive_t *drive, int arg)
 
 	if (arg) {
 		hwif->dma_off_quietly(drive);
-		if (ide_set_dma(drive) || hwif->ide_dma_on(drive))
+		if (ide_set_dma(drive))
 			err = -EIO;
 	} else
 		ide_dma_off(drive);