[PATCH 9/15] sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
[PATCH] 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 <[EMAIL PROTECTED]>
---
drivers/ide/pci/sgiioc4.c | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
Index: b/drivers/ide/pci/sgiioc4.c
===
--- 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
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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 9/15] sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
[PATCH] 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 [EMAIL PROTECTED]
---
drivers/ide/pci/sgiioc4.c | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
Index: b/drivers/ide/pci/sgiioc4.c
===
--- 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
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)
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
