Commit 9ef5791e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d8f4469d

drivers/ide/pci/sgiioc4.c

+11 −15
Original line number Diff line number Diff line
@@ -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)

{
@@ -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)