Skip to contentSkip to conversation

hpt366: kill set_dma_mode() method wrapper

PATCH Applied Sergei Shtylyov 2 participants 2 messages Dec 8, 2007 – Dec 9, 2007 libata

lore
Share & tools
lore

Sergei Shtylyov

author
#0 lore raw

PATCH 1/1 hpt366: kill set_dma_mode() method wrapper

There's no reason to keep the set_dma_mode() method wrapper for two different chip families, so get rid of it...

Signed-off-by Sergei Shtylyov <[email protected]>

---
The patch is against the pata-2.6 patchset...

 drivers/ide/pci/hpt366.c |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
drivers/ide/pci/hpt366.c +7 -14
Index: linux-2.6/drivers/ide/pci/hpt366.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/hpt366.c		Version 1.23	Dec 7, 2007
+ * linux/drivers/ide/pci/hpt366.c		Version 1.24	Dec 8, 2007
  *
  * Copyright (C) 1999-2003		Andre Hedrick <[email protected]>
  * Portions Copyright (C) 2001	        Sun Microsystems, Inc.

@@ -725,20 +725,9 @@ static void hpt37x_set_mode(ide_drive_t 
 	pci_write_config_dword(dev, itr_addr, new_itr);
 }
 
-static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)
-{
-	ide_hwif_t *hwif	= HWIF(drive);
-	struct hpt_info	*info	= pci_get_drvdata(hwif->pci_dev);
-
-	if (info->chip_type >= HPT370)
-		hpt37x_set_mode(drive, speed);
-	else	/* hpt368: hpt_minimum_revision(dev, 2) */
-		hpt36x_set_mode(drive, speed);
-}
-
 static void hpt3xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-	hpt3xx_set_mode(drive, XFER_PIO_0 + pio);
+	HWIF(drive)->set_dma_mode(drive, XFER_PIO_0 + pio);
 }
 
 static void hpt3xx_quirkproc(ide_drive_t *drive)

@@ -1310,7 +1299,11 @@ static void __devinit init_hwif_hpt366(i
 	hwif->select_data	= hwif->channel ? 0x54 : 0x50;
 
 	hwif->set_pio_mode	= &hpt3xx_set_pio_mode;
-	hwif->set_dma_mode	= &hpt3xx_set_mode;
+	if (chip_type >= HPT370)
+		hwif->set_dma_mode = &hpt37x_set_mode;
+	else
+		hwif->set_dma_mode = &hpt36x_set_mode;
+
 	hwif->quirkproc		= &hpt3xx_quirkproc;
 	hwif->maskproc		= &hpt3xx_maskproc;
 	hwif->busproc		= &hpt3xx_busproc;