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/ppc/pmac.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/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index c547c76533d5..d3bb247e9574 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1979,10 +1979,8 @@ pmac_ide_dma_test_irq (ide_drive_t *drive) | |||
1979 | return 1; | 1979 | return 1; |
1980 | } | 1980 | } |
1981 | 1981 | ||
1982 | static int | 1982 | static void pmac_ide_dma_host_off(ide_drive_t *drive) |
1983 | pmac_ide_dma_host_off (ide_drive_t *drive) | ||
1984 | { | 1983 | { |
1985 | return 0; | ||
1986 | } | 1984 | } |
1987 | 1985 | ||
1988 | static int | 1986 | static int |
@@ -2034,7 +2032,7 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
2034 | return; | 2032 | return; |
2035 | } | 2033 | } |
2036 | 2034 | ||
2037 | hwif->ide_dma_off_quietly = &__ide_dma_off_quietly; | 2035 | hwif->dma_off_quietly = &ide_dma_off_quietly; |
2038 | hwif->ide_dma_on = &__ide_dma_on; | 2036 | hwif->ide_dma_on = &__ide_dma_on; |
2039 | hwif->ide_dma_check = &pmac_ide_dma_check; | 2037 | hwif->ide_dma_check = &pmac_ide_dma_check; |
2040 | hwif->dma_setup = &pmac_ide_dma_setup; | 2038 | hwif->dma_setup = &pmac_ide_dma_setup; |
@@ -2042,7 +2040,7 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
2042 | hwif->dma_start = &pmac_ide_dma_start; | 2040 | hwif->dma_start = &pmac_ide_dma_start; |
2043 | hwif->ide_dma_end = &pmac_ide_dma_end; | 2041 | hwif->ide_dma_end = &pmac_ide_dma_end; |
2044 | hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq; | 2042 | hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq; |
2045 | hwif->ide_dma_host_off = &pmac_ide_dma_host_off; | 2043 | hwif->dma_host_off = &pmac_ide_dma_host_off; |
2046 | hwif->ide_dma_host_on = &pmac_ide_dma_host_on; | 2044 | hwif->ide_dma_host_on = &pmac_ide_dma_host_on; |
2047 | hwif->ide_dma_timeout = &__ide_dma_timeout; | 2045 | hwif->ide_dma_timeout = &__ide_dma_timeout; |
2048 | hwif->ide_dma_lostirq = &pmac_ide_dma_lostirq; | 2046 | hwif->ide_dma_lostirq = &pmac_ide_dma_lostirq; |