pata_pcmcia/ide-cs: move IDs table to <linux/pata_pcmcia_ids.h>

PATCH In review Bartlomiej Zolnierkiewicz 4 participants 4 messages Oct 13, 2011 – Oct 14, 2011 libata

Share & tools

Bartlomiej Zolnierkiewicz

author

2011-10-13 11:12 UTC #0 lore raw

PATCH 1/1 pata_pcmcia/ide-cs: move IDs table to <linux/pata_pcmcia_ids.h>

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] pata_pcmcia/ide-cs: move IDs table to <linux/pata_pcmcia_ids.h>

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

---
 drivers/ata/pata_pcmcia.c       |   74 +---------------------------------------
 drivers/ide/ide-cs.c            |   74 +---------------------------------------
 include/linux/pata_pcmcia_ids.h |   70 +++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 143 deletions(-)

drivers/ata/pata_pcmcia.c +2 ~~-72~~

Index: b/drivers/ata/pata_pcmcia.c
===================================================================
@@ -39,6 +39,7 @@
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
 
+#include <linux/pata_pcmcia_ids.h>
 
 #define DRV_NAME "pata_pcmcia"
 #define DRV_VERSION "0.3.5"

@@ -309,81 +310,10 @@ static void pcmcia_remove_one(struct pcm
 	pcmcia_disable_device(pdev);
 }
 
-static const struct pcmcia_device_id pcmcia_devices[] = {
-	PCMCIA_DEVICE_FUNC_ID(4),
-	PCMCIA_DEVICE_MANF_CARD(0x0000, 0x0000),	/* Corsair */
-	PCMCIA_DEVICE_MANF_CARD(0x0007, 0x0000),	/* Hitachi */
-	PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),	/* I-O Data CFA */
-	PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),	/* Mitsubishi CFA */
-	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
-	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),
-	PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),	/* SanDisk CFA */
-	PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),	/* Kingston */
-	PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620), 	/* TI emulated */
-	PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),	/* Toshiba */
-	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
-	PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),	/* Samsung */
-	PCMCIA_DEVICE_MANF_CARD(0x0319, 0x0000),	/* Hitachi */
-	PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001),
-	PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0100),	/* Viking CFA */
-	PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200),	/* Lexar, Viking CFA */
-	PCMCIA_DEVICE_PROD_ID123("Caravelle", "PSC-IDE ", "PSC000", 0x8c36137c, 0xd0693ab8, 0x2768a9f0),
-	PCMCIA_DEVICE_PROD_ID123("CDROM", "IDE", "MCD-601p", 0x1b9179ca, 0xede88951, 0x0d902f74),
-	PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
-	PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
-	PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
-	PCMCIA_DEVICE_PROD_ID12("CNF   ", "CD-ROM", 0x46d7db81, 0x66536591),
-	PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
-	PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
-	PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
-	PCMCIA_DEVICE_PROD_ID12("EXP", "CD+GAME", 0x6f58c983, 0x63c13aaf),
-	PCMCIA_DEVICE_PROD_ID12("EXP   ", "CD-ROM", 0x0a5c52fd, 0x66536591),
-	PCMCIA_DEVICE_PROD_ID12("EXP   ", "PnPIDE", 0x0a5c52fd, 0x0c694728),
-	PCMCIA_DEVICE_PROD_ID12("FREECOM", "PCCARD-IDE", 0x5714cbf7, 0x48e0ab8e),
-	PCMCIA_DEVICE_PROD_ID12("HITACHI", "FLASH", 0xf4f43949, 0x9eb86aae),
-	PCMCIA_DEVICE_PROD_ID12("HITACHI", "microdrive", 0xf4f43949, 0xa6d76178),
-	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
-	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
-	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
-	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x55d5bffb),
-	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
-	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
-	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
-	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
-	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
-	PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
-	PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF300", 0x7ed2ad87, 0x7e9e78ee),
-	PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
-	PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
-	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
-	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
-	PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
-	PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),
-	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
-	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
-	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
-	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF45", 0x709b1bf1, 0xf68b6f32),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x7558f133),
-	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
-	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
-	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
-	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
-	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
-	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
-	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
-	PCMCIA_DEVICE_NULL,
-};
-
-MODULE_DEVICE_TABLE(pcmcia, pcmcia_devices);
-
 static struct pcmcia_driver pcmcia_driver = {
 	.owner		= THIS_MODULE,
 	.name		= DRV_NAME,
-	.id_table	= pcmcia_devices,
+	.id_table	= pata_pcmcia_devices,
 	.probe		= pcmcia_init_one,
 	.remove		= pcmcia_remove_one,
 };

drivers/ide/ide-cs.c +3 ~~-71~~

91 lines not on this page · raw message

include/linux/pata_pcmcia_ids.h new file +70 -0

70 lines not on this page · raw message

Alan Cox

Acked-by on v1 1/1

2011-10-13 12:55 UTC #1 lore raw

Quoted 9 lines · On Thu, 13 Oct 2011 13:12:14 +0200 Bartlomiej Zolnierkiewicz…

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] pata_pcmcia/ide-cs: move IDs table to <linux/pata_pcmcia_ids.h>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ata/pata_pcmcia.c       |   74 +---------------------------------------
 drivers/ide/ide-cs.c            |   74 +---------------------------------------
 include/linux/pata_pcmcia_ids.h |   70 +++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 143 deletions(-)

Acked-by Alan Cox <[email protected]>

Jeff Garzik

2011-10-14 16:55 UTC #2 lore raw

In reply to Bartlomiej Zolnierkiewicz

Quoted 9 lines · Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz<[email protected]>
Subject: [PATCH] pata_pcmcia/ide-cs: move IDs table to<linux/pata_pcmcia_ids.h>
Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>
---
  drivers/ata/pata_pcmcia.c       |   74 +---------------------------------------
  drivers/ide/ide-cs.c            |   74 +---------------------------------------
  include/linux/pata_pcmcia_ids.h |   70 +++++++++++++++++++++++++++++++++++++
  3 files changed, 75 insertions(+), 143 deletions(-)

I'm torn... it is an obvious and simple consolidation, but I dislike dropping such a driver-specific turd in include/linux. I also wonder if we want to continue adding new IDs to ide-cs?

David, any opinions? I'm basically ok with any option: (a) take Bart's patch as-is (with your acked-by), (b) ignore the patch and set a no-new-ids policy for ide-cs, (c) other?

Jeff

David Miller

2011-10-14 18:17 UTC #3 lore raw

From: Jeff Garzik <[email protected]>
Date: Fri, 14 Oct 2011 12:55:36 -0400

Quoted 14 lines · Bartlomiej Zolnierkiewicz

Quoted 4 lines
From: Bartlomiej Zolnierkiewicz<[email protected]>
Subject: [PATCH] pata_pcmcia/ide-cs: move IDs table to<linux/pata_pcmcia_ids.h>
Quoted 8 lines
Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>
---
  drivers/ata/pata_pcmcia.c | 74
  +---------------------------------------
  drivers/ide/ide-cs.c | 74 +---------------------------------------
  include/linux/pata_pcmcia_ids.h | 70
  +++++++++++++++++++++++++++++++++++++
  3 files changed, 75 insertions(+), 143 deletions(-)

Quoted 7 lines

I'm torn... it is an obvious and simple consolidation, but I dislike dropping such a driver-specific turd in include/linux. I also wonder if we want to continue adding new IDs to ide-cs?
David, any opinions? I'm basically ok with any option: (a) take Bart's patch as-is (with your acked-by), (b) ignore the patch and set a no-new-ids policy for ide-cs, (c) other?

Option 'b' please, thanks.