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/cris/ide-cris.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/cris/ide-cris.c')
-rw-r--r-- | drivers/ide/cris/ide-cris.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index 027341d66b28..c81b2719bca6 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
@@ -682,9 +682,12 @@ static void cris_ide_input_data (ide_drive_t *drive, void *, unsigned int); | |||
682 | static void cris_ide_output_data (ide_drive_t *drive, void *, unsigned int); | 682 | static void cris_ide_output_data (ide_drive_t *drive, void *, unsigned int); |
683 | static void cris_atapi_input_bytes(ide_drive_t *drive, void *, unsigned int); | 683 | static void cris_atapi_input_bytes(ide_drive_t *drive, void *, unsigned int); |
684 | static void cris_atapi_output_bytes(ide_drive_t *drive, void *, unsigned int); | 684 | static void cris_atapi_output_bytes(ide_drive_t *drive, void *, unsigned int); |
685 | static int cris_dma_off (ide_drive_t *drive); | ||
686 | static int cris_dma_on (ide_drive_t *drive); | 685 | static int cris_dma_on (ide_drive_t *drive); |
687 | 686 | ||
687 | static void cris_dma_off(ide_drive_t *drive) | ||
688 | { | ||
689 | } | ||
690 | |||
688 | static void tune_cris_ide(ide_drive_t *drive, u8 pio) | 691 | static void tune_cris_ide(ide_drive_t *drive, u8 pio) |
689 | { | 692 | { |
690 | int setup, strobe, hold; | 693 | int setup, strobe, hold; |
@@ -814,9 +817,9 @@ init_e100_ide (void) | |||
814 | hwif->OUTBSYNC = &cris_ide_outbsync; | 817 | hwif->OUTBSYNC = &cris_ide_outbsync; |
815 | hwif->INB = &cris_ide_inb; | 818 | hwif->INB = &cris_ide_inb; |
816 | hwif->INW = &cris_ide_inw; | 819 | hwif->INW = &cris_ide_inw; |
817 | hwif->ide_dma_host_off = &cris_dma_off; | 820 | hwif->dma_host_off = &cris_dma_off; |
818 | hwif->ide_dma_host_on = &cris_dma_on; | 821 | hwif->ide_dma_host_on = &cris_dma_on; |
819 | hwif->ide_dma_off_quietly = &cris_dma_off; | 822 | hwif->dma_off_quietly = &cris_dma_off; |
820 | hwif->udma_four = 0; | 823 | hwif->udma_four = 0; |
821 | hwif->ultra_mask = cris_ultra_mask; | 824 | hwif->ultra_mask = cris_ultra_mask; |
822 | hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */ | 825 | hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */ |
@@ -838,11 +841,6 @@ init_e100_ide (void) | |||
838 | cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0); | 841 | cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0); |
839 | } | 842 | } |
840 | 843 | ||
841 | static int cris_dma_off (ide_drive_t *drive) | ||
842 | { | ||
843 | return 0; | ||
844 | } | ||
845 | |||
846 | static int cris_dma_on (ide_drive_t *drive) | 844 | static int cris_dma_on (ide_drive_t *drive) |
847 | { | 845 | { |
848 | return 0; | 846 | return 0; |