ide: remove ->ide_dma_on and ->dma_off_quietly methods from ide_hwif_t

* Make ide_dma_off_quietly() and __ide_dma_on() always available.

* Drop "__" prefix from __ide_dma_on().

* Check for presence of ->dma_host_on instead of ->ide_dma_on.

* Convert all users of ->ide_dma_on and ->dma_off_quietly methods
  to use ide_dma_on() and ide_dma_off_quietly() instead.

* Remove no longer needed ->ide_dma_on and ->dma_off_quietly methods
  from ide_hwif_t.

* Make ide_dma_on() void.

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>

1 files changed, 0 insertions, 16 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index d70442a37e34..3a8402bb5dc3 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -291,24 +291,10 @@ static void icside_dma_host_off(ide_drive_t *drive)
 {
 }
 
-static void icside_dma_off_quietly(ide_drive_t *drive)
-{
-        drive->using_dma = 0;
-        ide_toggle_bounce(drive, 0);
-}
-
 static void icside_dma_host_on(ide_drive_t *drive)
 {
 }
 
-static int icside_dma_on(ide_drive_t *drive)
-{
-        drive->using_dma = 1;
-        ide_toggle_bounce(drive, 1);
-
-        return 0;
-}
-
 static int icside_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
@@ -425,9 +411,7 @@ static void icside_dma_init(ide_hwif_t *hwif)
         hwif->set_dma_mode      = icside_set_dma_mode;
 
         hwif->dma_host_off      = icside_dma_host_off;
-        hwif->dma_off_quietly   = icside_dma_off_quietly;
         hwif->dma_host_on       = icside_dma_host_on;
-        hwif->ide_dma_on        = icside_dma_on;
         hwif->dma_setup         = icside_dma_setup;
         hwif->dma_exec_cmd      = icside_dma_exec_cmd;
         hwif->dma_start         = icside_dma_start;