diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
commit | 7469aaf6a30f4187ed6de7c0aed5c2dd2d1c2d31 (patch) | |
tree | 079930f23b3d14e4ad29ab972bc6d91fde52e5f0 /drivers/ide/arm | |
parent | 3608b5d71a52c053787dbad6af20c25f7e0b75a9 (diff) |
ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
* since ide_hwif_t.ide_dma_{host_off,off_quietly} always return '0'
make these functions void and while at it drop "ide_" prefix
* fix comment for __ide_dma_off_quietly()
* make __ide_dma_{host_off,off_quietly,off}() void and drop "__" prefix
v2:
* while at it rename atiixp_ide_dma_host_off() to atiixp_dma_host_off(),
sgiioc4_ide_dma_{host_off,off_quietly}() to sgiioc4_dma_{host_off,off_quietly}()
and sl82c105_ide_dma_off_quietly() to sl82c105_dma_off_quietly()
[ Noticed by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/icside.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index aeed0205ce64..de3739270bc0 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -307,15 +307,13 @@ static int icside_set_speed(ide_drive_t *drive, u8 xfer_mode) | |||
307 | return on; | 307 | return on; |
308 | } | 308 | } |
309 | 309 | ||
310 | static int icside_dma_host_off(ide_drive_t *drive) | 310 | static void icside_dma_host_off(ide_drive_t *drive) |
311 | { | 311 | { |
312 | return 0; | ||
313 | } | 312 | } |
314 | 313 | ||
315 | static int icside_dma_off_quietly(ide_drive_t *drive) | 314 | static void icside_dma_off_quietly(ide_drive_t *drive) |
316 | { | 315 | { |
317 | drive->using_dma = 0; | 316 | drive->using_dma = 0; |
318 | return icside_dma_host_off(drive); | ||
319 | } | 317 | } |
320 | 318 | ||
321 | static int icside_dma_host_on(ide_drive_t *drive) | 319 | static int icside_dma_host_on(ide_drive_t *drive) |
@@ -494,8 +492,8 @@ static void icside_dma_init(ide_hwif_t *hwif) | |||
494 | hwif->autodma = autodma; | 492 | hwif->autodma = autodma; |
495 | 493 | ||
496 | hwif->ide_dma_check = icside_dma_check; | 494 | hwif->ide_dma_check = icside_dma_check; |
497 | hwif->ide_dma_host_off = icside_dma_host_off; | 495 | hwif->dma_host_off = icside_dma_host_off; |
498 | hwif->ide_dma_off_quietly = icside_dma_off_quietly; | 496 | hwif->dma_off_quietly = icside_dma_off_quietly; |
499 | hwif->ide_dma_host_on = icside_dma_host_on; | 497 | hwif->ide_dma_host_on = icside_dma_host_on; |
500 | hwif->ide_dma_on = icside_dma_on; | 498 | hwif->ide_dma_on = icside_dma_on; |
501 | hwif->dma_setup = icside_dma_setup; | 499 | hwif->dma_setup = icside_dma_setup; |