libata: remove no longer needed pata_qdi driver

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Oct 13, 2011 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2011-10-13 13:20 UTC #0 lore raw

PATCH 3/3 libata: remove no longer needed pata_qdi driver

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] libata: remove no longer needed pata_qdi driver

QDI65x0 controllers are fully supported by pata_legacy driver so remove no longer needed pata_qdi driver.

Leave PATA_QDI config option for compatibility reasons and teach pata_legacy to preserve the old behavior of pata_qdi driver.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
earlier references:
https://lkml.org/lkml/2009/11/25/364

 drivers/ata/Kconfig       |    1 
 drivers/ata/Makefile      |    1 
 drivers/ata/pata_legacy.c |    9 +
 drivers/ata/pata_qdi.c    |  366 ----------------------------------------------
 4 files changed, 9 insertions(+), 368 deletions(-)

drivers/ata/Kconfig +1 -0

Index: b/drivers/ata/Kconfig
===================================================================
@@ -795,6 +795,7 @@ config PATA_OF_PLATFORM
 config PATA_QDI
 	tristate "QDI VLB PATA support"
 	depends on ISA
+	select PATA_LEGACY
 	help
 	  Support for QDI 6500 and 6580 PATA controllers on VESA local bus.

drivers/ata/Makefile +0 -1

Index: b/drivers/ata/Makefile
===================================================================
@@ -85,7 +85,6 @@ obj-$(CONFIG_PATA_PCMCIA)	+= pata_pcmcia
 obj-$(CONFIG_PATA_PALMLD)	+= pata_palmld.o
 obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o
 obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
-obj-$(CONFIG_PATA_QDI)		+= pata_qdi.o
 obj-$(CONFIG_PATA_RB532)	+= pata_rb532_cf.o
 obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o
 obj-$(CONFIG_PATA_SAMSUNG_CF)	+= pata_samsung_cf.o

drivers/ata/pata_legacy.c +8 -1

Index: b/drivers/ata/pata_legacy.c
===================================================================
@@ -136,11 +136,17 @@ static int ht6560a;		/* HT 6560A on prim
 static int ht6560b;		/* HT 6560A on primary 1, second 2, both 3 */
 static int opti82c611a;		/* Opti82c611A on primary 1, sec 2, both 3 */
 static int opti82c46x;		/* Opti 82c465MV present(pri/sec autodetect) */
-static int qdi;			/* Set to probe QDI controllers */
 static int autospeed;		/* Chip present which snoops speed changes */
 static int pio_mask = ATA_PIO4;	/* PIO range for autospeed devices */
 static int iordy_mask = 0xFFFFFFFF;	/* Use iordy if available */
 
+/* Set to probe QDI controllers */
+#ifdef CONFIG_PATA_QDI_MODULE
+static int qdi = 1;
+#else
+static int qdi;
+#endif
+
 #ifdef CONFIG_PATA_WINBOND_VLB_MODULE
 static int winbond = 1;		/* Set to probe Winbond controllers,
 					give I/O port if non standard */

@@ -1254,6 +1260,7 @@ MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for legacy ATA");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("pata_qdi");
 MODULE_ALIAS("pata_winbond");
 
 module_param(probe_all, int, 0);

drivers/ata/pata_qdi.c deleted +0 ~~-366~~

366 lines not on this page · raw message

Alan Cox

Acked-by on v1 3/3

2011-10-13 15:57 UTC #1 lore raw

Quoted 10 lines · On Thu, 13 Oct 2011 15:11:39 +0200 Bartlomiej Zolnierkiewicz…

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] libata: remove no longer needed pata_qdi driver
QDI65x0 controllers are fully supported by pata_legacy driver so remove no longer needed pata_qdi driver.
Leave PATA_QDI config option for compatibility reasons and teach pata_legacy to preserve the old behavior of pata_qdi driver.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

Acked-by Alan Cox <[email protected]>