diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-17 02:40:26 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-17 02:40:26 +0100 |
| commit | 9ef5791e1be91007951477b8ed1530ac1166a8e7 (patch) | |
| tree | 353f2c04ad2d6c27d9e3744a1507ab8b2830afdf /drivers | |
| parent | d8f4469d5f2c35e0b8272f254b42737a2b8ce877 (diff) | |
| download | blackbird-op-linux-9ef5791e1be91007951477b8ed1530ac1166a8e7.tar.gz blackbird-op-linux-9ef5791e1be91007951477b8ed1530ac1166a8e7.zip | |
sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
* 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/pci/sgiioc4.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 083c7afe1162..290697e09e55 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c @@ -275,21 +275,6 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) } 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) { drive->using_dma = 1; @@ -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) |
