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/ide-cd.c | |
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/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 624d48841533..45a928c058cf 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1104,7 +1104,7 @@ static ide_startstop_t cdrom_read_intr (ide_drive_t *drive) | |||
1104 | if (dma) { | 1104 | if (dma) { |
1105 | info->dma = 0; | 1105 | info->dma = 0; |
1106 | if ((dma_error = HWIF(drive)->ide_dma_end(drive))) | 1106 | if ((dma_error = HWIF(drive)->ide_dma_end(drive))) |
1107 | __ide_dma_off(drive); | 1107 | ide_dma_off(drive); |
1108 | } | 1108 | } |
1109 | 1109 | ||
1110 | if (cdrom_decode_status(drive, 0, &stat)) | 1110 | if (cdrom_decode_status(drive, 0, &stat)) |
@@ -1700,7 +1700,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
1700 | if (dma) { | 1700 | if (dma) { |
1701 | if (dma_error) { | 1701 | if (dma_error) { |
1702 | printk(KERN_ERR "ide-cd: dma error\n"); | 1702 | printk(KERN_ERR "ide-cd: dma error\n"); |
1703 | __ide_dma_off(drive); | 1703 | ide_dma_off(drive); |
1704 | return ide_error(drive, "dma error", stat); | 1704 | return ide_error(drive, "dma error", stat); |
1705 | } | 1705 | } |
1706 | 1706 | ||
@@ -1826,7 +1826,7 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive) | |||
1826 | info->dma = 0; | 1826 | info->dma = 0; |
1827 | if ((dma_error = HWIF(drive)->ide_dma_end(drive))) { | 1827 | if ((dma_error = HWIF(drive)->ide_dma_end(drive))) { |
1828 | printk(KERN_ERR "ide-cd: write dma error\n"); | 1828 | printk(KERN_ERR "ide-cd: write dma error\n"); |
1829 | __ide_dma_off(drive); | 1829 | ide_dma_off(drive); |
1830 | } | 1830 | } |
1831 | } | 1831 | } |
1832 | 1832 | ||