diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:19 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:19 -0500 |
commit | 7b905994ce0bd332afc5ebc30ce9afa60d23c6e2 (patch) | |
tree | 4f0f25616d816087e0022dce95f996c99c8dcc6e /drivers/ide/ide.c | |
parent | 23b1bd459c9e8a925381960f0b69ac85468c3af1 (diff) |
ide: cleanup ide_set_dma()
* ->dma_off_quietly is always called before ide_set_dma()
so the call can be moved inside ide_set_dma().
* ide_dma_check() doesn't touch hardware so ->dma_off_quietly
call for 'rc == -1' case is redundant, remove it.
* '0' and '-1' are the only values returned by ide_dma_check()
so remove dead code for other cases.
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>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 00ef6ec2c273..c6d4f630e18a 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -851,7 +851,6 @@ int set_using_dma(ide_drive_t *drive, int arg) | |||
851 | err = 0; | 851 | err = 0; |
852 | 852 | ||
853 | if (arg) { | 853 | if (arg) { |
854 | hwif->dma_off_quietly(drive); | ||
855 | if (ide_set_dma(drive)) | 854 | if (ide_set_dma(drive)) |
856 | err = -EIO; | 855 | err = -EIO; |
857 | } else | 856 | } else |