Skip to contentSkip to conversation

cs5520: don't enable VDMA in ->speedproc

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Jul 13, 2007 – Jul 18, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 cs5520: don't enable VDMA in ->speedproc

There is no need to do it in cs5520_tune_chipset() (->speedproc method) since it is correctly handled by cs5520_dma_on() (->ide_dma_on method).

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/pci/cs5520.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/ide/pci/cs5520.c +4 -9
Index: b/drivers/ide/pci/cs5520.c
===================================================================
@@ -73,7 +73,6 @@ static int cs5520_tune_chipset(ide_drive
 	int pio = speed;
 	u8 reg;
 	int controller = drive->dn > 1 ? 1 : 0;
-	int error;
 
 	switch(speed)
 	{

@@ -114,14 +113,9 @@ static int cs5520_tune_chipset(ide_drive
 	reg = inb(hwif->dma_base + 0x02 + 8*controller);
 	reg |= 1<<((drive->dn&1)+5);
 	outb(reg, hwif->dma_base + 0x02 + 8*controller);
-		
-	error = ide_config_drive_speed(drive, speed);
-	/* ATAPI is harder so leave it for now */
-	if(!error && drive->media == ide_disk)
-		error = hwif->ide_dma_on(drive);
 
-	return error;
-}	
+	return ide_config_drive_speed(drive, speed);
+}
 
 static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {

@@ -177,7 +171,8 @@ static void __devinit init_hwif_cs5520(i
 		hwif->drives[1].autotune = 1;
 		return;
 	}
-	
+
+	/* ATAPI is harder so leave it for now */
 	hwif->atapi_dma = 0;
 	hwif->ultra_mask = 0;
 	hwif->swdma_mask = 0;