You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
ide: remove ->ide_dma_on and ->dma_off_quietly methods from ide_hwif_t
* Make ide_dma_off_quietly() and __ide_dma_on() always available. * Drop "__" prefix from __ide_dma_on(). * Check for presence of ->dma_host_on instead of ->ide_dma_on. * Convert all users of ->ide_dma_on and ->dma_off_quietly methods to use ide_dma_on() and ide_dma_off_quietly() instead. * Remove no longer needed ->ide_dma_on and ->dma_off_quietly methods from ide_hwif_t. * Make ide_dma_on() void. There should be no functionality changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -399,24 +399,10 @@ static void auide_dma_host_on(ide_drive_t *drive)
|
||||
{
|
||||
}
|
||||
|
||||
static int auide_dma_on(ide_drive_t *drive)
|
||||
{
|
||||
drive->using_dma = 1;
|
||||
ide_toggle_bounce(drive, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void auide_dma_host_off(ide_drive_t *drive)
|
||||
{
|
||||
}
|
||||
|
||||
static void auide_dma_off_quietly(ide_drive_t *drive)
|
||||
{
|
||||
drive->using_dma = 0;
|
||||
ide_toggle_bounce(drive, 0);
|
||||
}
|
||||
|
||||
static void auide_dma_lost_irq(ide_drive_t *drive)
|
||||
{
|
||||
printk(KERN_ERR "%s: IRQ lost\n", drive->name);
|
||||
@@ -684,7 +670,6 @@ static int au_ide_probe(struct device *dev)
|
||||
hwif->set_dma_mode = &auide_set_dma_mode;
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
|
||||
hwif->dma_off_quietly = &auide_dma_off_quietly;
|
||||
hwif->dma_timeout = &auide_dma_timeout;
|
||||
|
||||
hwif->mdma_filter = &auide_mdma_filter;
|
||||
@@ -697,7 +682,6 @@ static int au_ide_probe(struct device *dev)
|
||||
hwif->dma_host_off = &auide_dma_host_off;
|
||||
hwif->dma_host_on = &auide_dma_host_on;
|
||||
hwif->dma_lost_irq = &auide_dma_lost_irq;
|
||||
hwif->ide_dma_on = &auide_dma_on;
|
||||
#else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
|
||||
hwif->channel = 0;
|
||||
hwif->hold = 1;
|
||||
|
||||
Reference in New Issue
Block a user