Skip to content

Commit

Permalink
sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
Browse files Browse the repository at this point in the history
* use sgiioc4_ide_dma_{on,off_quietly}() instead of changing
  drive->using_dma directly
* fix warning message
* add FIXME

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 17, 2007
1 parent d8f4469 commit 9ef5791
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions drivers/ide/pci/sgiioc4.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,21 +274,6 @@ sgiioc4_ide_dma_end(ide_drive_t * drive)
return dma_stat;
}

static int
sgiioc4_ide_dma_check(ide_drive_t * drive)
{
if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
printk(KERN_INFO
"Couldnot set %s in Multimode-2 DMA mode | "
"Drive %s using PIO instead\n",
drive->name, drive->name);
drive->using_dma = 0;
} else
drive->using_dma = 1;

return 0;
}

static int
sgiioc4_ide_dma_on(ide_drive_t * drive)
{
Expand All @@ -305,6 +290,17 @@ sgiioc4_ide_dma_off_quietly(ide_drive_t * drive)
return HWIF(drive)->ide_dma_host_off(drive);
}

static int sgiioc4_ide_dma_check(ide_drive_t *drive)
{
/* FIXME: check for available DMA modes */
if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
printk(KERN_WARNING "%s: couldn't set MWDMA2 mode, "
"using PIO instead\n", drive->name);
return sgiioc4_ide_dma_off_quietly(drive);
} else
return sgiioc4_ide_dma_on(drive);
}

/* returns 1 if dma irq issued, 0 otherwise */
static int
sgiioc4_ide_dma_test_irq(ide_drive_t * drive)
Expand Down

0 comments on commit 9ef5791

Please sign in to comment.