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/pci/sc1200.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/pci/sc1200.c')
-rw-r--r-- | drivers/ide/pci/sc1200.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 08e317f281e7..b5ae0c50e216 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -161,7 +161,7 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode) | |||
161 | /* | 161 | /* |
162 | * Default to DMA-off in case we run into trouble here. | 162 | * Default to DMA-off in case we run into trouble here. |
163 | */ | 163 | */ |
164 | hwif->ide_dma_off_quietly(drive); /* turn off DMA while we fiddle */ | 164 | hwif->dma_off_quietly(drive); /* turn off DMA while we fiddle */ |
165 | outb(inb(hwif->dma_base+2)&~(unit?0x40:0x20), hwif->dma_base+2); /* clear DMA_capable bit */ | 165 | outb(inb(hwif->dma_base+2)&~(unit?0x40:0x20), hwif->dma_base+2); /* clear DMA_capable bit */ |
166 | 166 | ||
167 | /* | 167 | /* |
@@ -439,10 +439,10 @@ static int sc1200_resume (struct pci_dev *dev) | |||
439 | ide_drive_t *drive = &(hwif->drives[d]); | 439 | ide_drive_t *drive = &(hwif->drives[d]); |
440 | if (drive->present && !__ide_dma_bad_drive(drive)) { | 440 | if (drive->present && !__ide_dma_bad_drive(drive)) { |
441 | int was_using_dma = drive->using_dma; | 441 | int was_using_dma = drive->using_dma; |
442 | hwif->ide_dma_off_quietly(drive); | 442 | hwif->dma_off_quietly(drive); |
443 | sc1200_config_dma(drive); | 443 | sc1200_config_dma(drive); |
444 | if (!was_using_dma && drive->using_dma) { | 444 | if (!was_using_dma && drive->using_dma) { |
445 | hwif->ide_dma_off_quietly(drive); | 445 | hwif->dma_off_quietly(drive); |
446 | } | 446 | } |
447 | } | 447 | } |
448 | } | 448 | } |