ide: make void and rename ide_dma_timeout() method
Since ide_dma_timeout() method's result is discarded, make it return 'void'. While at it, drop 'ide_' from the method's name, drop the '__' prefix from the default method's name, and do some cleanups in this method driver-wise: - in ide-dma.c, au1xxx-ide.c, and pdc202xx_old.c, define/use 'hwif' variable; - in au1xxx-ide.c, get rid of commented out printk(); - in sl82c105.c, get rid of unnecessary variables. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
committed by
Bartlomiej Zolnierkiewicz
parent
841d2a9bf1
commit
c283f5dbe3
@@ -799,10 +799,10 @@ static int hpt370_ide_dma_end(ide_drive_t *drive)
|
||||
return __ide_dma_end(drive);
|
||||
}
|
||||
|
||||
static int hpt370_ide_dma_timeout(ide_drive_t *drive)
|
||||
static void hpt370_dma_timeout(ide_drive_t *drive)
|
||||
{
|
||||
hpt370_irq_timeout(drive);
|
||||
return __ide_dma_timeout(drive);
|
||||
ide_dma_timeout(drive);
|
||||
}
|
||||
|
||||
/* returns 1 if DMA IRQ issued, 0 otherwise */
|
||||
@@ -1353,7 +1353,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
|
||||
} else if (chip_type >= HPT370) {
|
||||
hwif->dma_start = &hpt370_ide_dma_start;
|
||||
hwif->ide_dma_end = &hpt370_ide_dma_end;
|
||||
hwif->ide_dma_timeout = &hpt370_ide_dma_timeout;
|
||||
hwif->dma_timeout = &hpt370_dma_timeout;
|
||||
} else
|
||||
hwif->dma_lost_irq = &hpt366_dma_lost_irq;
|
||||
|
||||
|
Reference in New Issue
Block a user