make pci_ids lowercase hexa

Make all ids in the document to be the same style.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 63c2460f837cabeeecc79026d668950d02b035c0
tree 72919579497e4fed0f02d3cba14f39a371ece7e2
parent 427d2812b00e5dcd2ed94c82fb7215f4d86b0530
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:05:47 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:05:47 +0200

 include/linux/pci_ids.h |  222 ++++++++++++++++++++++++-----------------------
 1 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 24a5f46..2f1804c 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -196,11 +196,11 @@
 #define PCI_DEVICE_ID_LSI_63C815	0x1000
 #define PCI_DEVICE_ID_LSI_SAS1064	0x0050
 #define PCI_DEVICE_ID_LSI_SAS1064R	0x0411
-#define PCI_DEVICE_ID_LSI_SAS1066	0x005E
+#define PCI_DEVICE_ID_LSI_SAS1066	0x005e
 #define PCI_DEVICE_ID_LSI_SAS1068	0x0054
-#define PCI_DEVICE_ID_LSI_SAS1064A	0x005C
+#define PCI_DEVICE_ID_LSI_SAS1064A	0x005c
 #define PCI_DEVICE_ID_LSI_SAS1064E	0x0056
-#define PCI_DEVICE_ID_LSI_SAS1066E	0x005A
+#define PCI_DEVICE_ID_LSI_SAS1066E	0x005a
 #define PCI_DEVICE_ID_LSI_SAS1068E	0x0058
 #define PCI_DEVICE_ID_LSI_SAS1078	0x0060
 
@@ -221,14 +221,14 @@
 #define PCI_DEVICE_ID_ATI_215GTB	0x4755
 #define PCI_DEVICE_ID_ATI_215_IV	0x4756
 #define PCI_DEVICE_ID_ATI_215_IW	0x4757
-#define PCI_DEVICE_ID_ATI_215_IZ	0x475A
+#define PCI_DEVICE_ID_ATI_215_IZ	0x475a
 #define PCI_DEVICE_ID_ATI_210888GX	0x4758
 #define PCI_DEVICE_ID_ATI_215_LB	0x4c42
 #define PCI_DEVICE_ID_ATI_215_LD	0x4c44
 #define PCI_DEVICE_ID_ATI_215_LG	0x4c47
 #define PCI_DEVICE_ID_ATI_215_LI	0x4c49
-#define PCI_DEVICE_ID_ATI_215_LM	0x4c4D
-#define PCI_DEVICE_ID_ATI_215_LN	0x4c4E
+#define PCI_DEVICE_ID_ATI_215_LM	0x4c4d
+#define PCI_DEVICE_ID_ATI_215_LN	0x4c4e
 #define PCI_DEVICE_ID_ATI_215_LR	0x4c52
 #define PCI_DEVICE_ID_ATI_215_LS	0x4c53
 #define ...
[ message continues ]

pci_ids, remove double or more empty lines

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit c6a5758632ca3e35aa299eb4a37ff615f19beb8b
tree c97b3fccab6d44c4e4c921a5803bdb6d58bf8fa8
parent 63c2460f837cabeeecc79026d668950d02b035c0
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:10:30 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:10:30 +0200

 include/linux/pci_ids.h |   48 -----------------------------------------------
 1 files changed, 0 insertions(+), 48 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2f1804c..a402e52 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -732,7 +732,6 @@
 #define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
 #define PCI_DEVICE_ID_ELSA_QS3000	0x3000
 
-
 #define PCI_VENDOR_ID_BUSLOGIC		      0x104b
 #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
 #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
@@ -778,7 +777,6 @@
 
 #define PCI_VENDOR_ID_SONY		0x104d
 
-
 /* Winbond have two vendor IDs! See 0x10ad as well */
 #define PCI_VENDOR_ID_WINBOND2		0x1050
 #define PCI_DEVICE_ID_WINBOND2_89C940F	0x5a5a
@@ -816,7 +814,6 @@
 #define PCI_DEVICE_ID_PROMISE_20276	0x5275
 #define PCI_DEVICE_ID_PROMISE_20277	0x7275
 
-
 #define PCI_VENDOR_ID_UMC		0x1060
 #define PCI_DEVICE_ID_UMC_UM8673F	0x0101
 #define PCI_DEVICE_ID_UMC_UM8886BF	0x673a
@@ -835,7 +832,6 @@
 #define PCI_DEVICE_ID_MYLEX_DAC960_BA	0xbA56
 #define PCI_DEVICE_ID_MYLEX_DAC960_GEM	0xb166
 
-
 #define PCI_VENDOR_ID_APPLE		0x106b
 #define PCI_DEVICE_ID_APPLE_BANDIT	0x0001
 #define PCI_DEVICE_ID_APPLE_HYDRA	0x000e
@@ -871,7 +867,6 @@
 #define PCI_DEVICE_ID_YAMAHA_744	0x0010
 #define PCI_DEVICE_ID_YAMAHA_754	0x0012
 
-
 #define PCI_VENDOR_ID_QLOGIC		0x1077
 #define PCI_DEVICE_ID_QLOGIC_ISP10160	0x1016
 #define PCI_DEVICE_ID_QLOGIC_ISP1020	0x1020
@@ -902,12 +897,9 @@
 #define PCI_DEVICE_ID_CYRIX_5530_AUDIO	0x0103
 #define PCI_DEVICE_ID_CYRIX_5530_VIDEO	0x0104
 
-
-
 #define ...
[ message continues ]

lanai, change VENDOR to DEVICE

There were 2 bad named macros in pci_ids (LANAI 2 and IHB). Rename it to
DEVICE, because it's device id. Also make some cleanpu in pci_device_id
table (use PCI_VDEVICE).

Cc: Mitchell Blank Jr <mitch@sfgoth.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 0046e56e3fb82170d030ae35aceecce9a87f1bfa
tree cf7931160ac3cac00ff62b9959416f0a920cbaf8
parent c6a5758632ca3e35aa299eb4a37ff615f19beb8b
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:25:08 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:25:08 +0200

 drivers/atm/lanai.c     |   14 ++++----------
 include/linux/pci_ids.h |    4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 09f477d..4e1fa50 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -246,8 +246,8 @@ struct lanai_vcc {
 };
 
 enum lanai_type {
-	lanai2	= PCI_VENDOR_ID_EF_ATM_LANAI2,
-	lanaihb	= PCI_VENDOR_ID_EF_ATM_LANAIHB
+	lanai2	= PCI_DEVICE_ID_EF_ATM_LANAI2,
+	lanaihb	= PCI_DEVICE_ID_EF_ATM_LANAIHB
 };
 
 struct lanai_dev_stats {
@@ -2631,14 +2631,8 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
 }
 
 static struct pci_device_id lanai_pci_tbl[] = {
-	{
-		PCI_VENDOR_ID_EF, PCI_VENDOR_ID_EF_ATM_LANAI2,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0
-	},
-	{
-		PCI_VENDOR_ID_EF, PCI_VENDOR_ID_EF_ATM_LANAIHB,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0
-	},
+	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAI2) },
+	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAIHB) },
 	{ 0, }	/* terminal entry */
 };
 MODULE_DEVICE_TABLE(pci, lanai_pci_tbl);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a402e52..df25c8a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1362,8 +1362,8 @@
 #define PCI_VENDOR_ID_EF		0x111a
 #define PCI_DEVICE_ID_EF_ATM_FPGA	0x0000
 #define PCI_DEVICE_ID_EF_ATM_ASIC	0x0002
-#define PCI_VENDOR_ID_EF_ATM_LANAI2	0x0003
-#define ...
[ message continues ]

pci_ids, reorder some entries

Some lines are not vendor sorted, reorder it to comply with the rest of
document.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit ed29fc665adc4f8ef224318cb0877394f9b75ea4
tree cc7e3228e425c0dfaa9962f9606ee2360388bb95
parent 2438fcec127e3c3fede4f712154a25c2fd4af560
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:33:54 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:33:54 +0200

 include/linux/pci_ids.h |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6126078..279f2c0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -133,6 +133,9 @@
 
 /* Vendors and devices.  Sort key: vendor first, device next. */
 
+#define PCI_VENDOR_ID_TTTECH		0x0357
+#define PCI_DEVICE_ID_TTTECH_MC322	0x000a
+
 #define PCI_VENDOR_ID_DYNALINK		0x0675
 #define PCI_DEVICE_ID_DYNALINK_IS64PH	0x1702
 
@@ -1863,6 +1866,8 @@
 #define PCI_DEVICE_ID_OXSEMI_16PCI952	0x9521
 #define PCI_DEVICE_ID_OXSEMI_16PCI952PP	0x9523
 
+#define PCI_VENDOR_ID_CHELSIO		0x1425
+
 #define PCI_VENDOR_ID_SAMSUNG		0x144d
 
 #define PCI_VENDOR_ID_MYRICOM		0x14c1
@@ -1971,8 +1976,6 @@
 #define PCI_DEVICE_ID_ENE_720		0x1421
 #define PCI_DEVICE_ID_ENE_722		0x1422
 
-#define PCI_VENDOR_ID_CHELSIO		0x1425
-
 #define PCI_SUBVENDOR_ID_PERLE          0x155f
 #define PCI_SUBDEVICE_ID_PCI_RAS4       0xf001
 #define PCI_SUBDEVICE_ID_PCI_RAS8       0xf010
@@ -1995,6 +1998,9 @@
 #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c
 #define PCI_DEVICE_ID_MELLANOX_SINAI	0x6274
 
+#define PCI_VENDOR_ID_QUICKNET		0x15e2
+#define PCI_DEVICE_ID_QUICKNET_XJ	0x0500
+
 #define PCI_VENDOR_ID_PDC		0x15e9
 
 #define PCI_VENDOR_ID_FARSITE           0x1619
@@ -2366,13 +2372,7 @@
 #define PCI_DEVICE_ID_TIGERJET_300	0x0001
 #define PCI_DEVICE_ID_TIGERJET_100	0x0002
 
-#define PCI_VENDOR_ID_TTTECH		0x0357
-#define PCI_DEVICE_ID_TTTECH_MC322	0x000a
-
 ...
[ message continues ]

pci_ids, add atheros and 3com_2 vendors

Atheros is wifi vendor. 3com_2 (0xa727) is an vendor id for one card with
ath chip.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 10800193cc6cfc3761914fd7e6813094f39199bb
tree 898657022e66f154a84224d5f09109f242ffc0ad
parent ed29fc665adc4f8ef224318cb0877394f9b75ea4
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:39:03 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:39:03 +0200

 include/linux/pci_ids.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 279f2c0..1f228f8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2018,6 +2018,8 @@
 #define PCI_DEVICE_ID_BCM1250_PCI	0x0001
 #define PCI_DEVICE_ID_BCM1250_HT	0x0002
 
+#define PCI_VENDOR_ID_ATHEROS		0x168c
+
 #define PCI_VENDOR_ID_NETCELL		0x169c
 #define PCI_DEVICE_ID_REVOLUTION	0x0044
 
@@ -2364,6 +2366,8 @@
 #define PCI_DEVICE_ID_NETMOS_9845	0x9845
 #define PCI_DEVICE_ID_NETMOS_9855	0x9855
 
+#define PCI_VENDOR_ID_3COM_2		0xa727
+
 #define PCI_SUBVENDOR_ID_EXSYS		0xd84d
 #define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
 #define PCI_SUBDEVICE_ID_EXSYS_4055	0x4055
-

[ message continues ]

traps, change VENDOR to DEVICE

Change macro for SGI lithium (arch/i386/mach-visws/traps.c) device from
VENDOR to DEVICE, because it's a device id.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 2438fcec127e3c3fede4f712154a25c2fd4af560
tree f61a928bd27787b56c0b2dfba3abaef1a810eff8
parent 0046e56e3fb82170d030ae35aceecce9a87f1bfa
author Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:31:06 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 16 Jun 2007 17:31:06 +0200

 arch/i386/mach-visws/traps.c |    4 ++--
 include/linux/pci_ids.h      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/i386/mach-visws/traps.c b/arch/i386/mach-visws/traps.c
index 5199bd0..843b67a 100644
--- a/arch/i386/mach-visws/traps.c
+++ b/arch/i386/mach-visws/traps.c
@@ -23,13 +23,13 @@ static __init void lithium_init(void)
 	set_fixmap(FIX_LI_PCIB, LI_PCI_B_PHYS);
 
 	if ((li_pcia_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||
-	    (li_pcia_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {
+	    (li_pcia_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {
 		printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'A');
 		panic("This machine is not SGI Visual Workstation 320/540");
 	}
 
 	if ((li_pcib_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||
-	    (li_pcib_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {
+	    (li_pcib_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {
 		printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'B');
 		panic("This machine is not SGI Visual Workstation 320/540");
 	}
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index df25c8a..6126078 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -937,8 +937,8 @@
 
 #define PCI_VENDOR_ID_SGI		0x10a9
 #define PCI_DEVICE_ID_SGI_IOC3		0x0003
+#define PCI_DEVICE_ID_SGI_LITHIUM	0x1002
 #define PCI_DEVICE_ID_SGI_IOC4		0x100a
-#define PCI_VENDOR_ID_SGI_LITHIUM	0x1002
 
 #define PCI_VENDOR_ID_WINBOND		0x10ad
 #define ...
[ message continues ]

Why?  What good is this going to do in the long run?

Also, shouldn't you send pci specific patches like this to the pci
maintainer?  :)

thanks,

greg k-h
-

[ message continues ]

It's just cleanup to get rid of things like this:
 #define PCI_DEVICE_ID_PROMISE_20246	0x4d33
 #define PCI_DEVICE_ID_PROMISE_20262	0x4d38
-#define PCI_DEVICE_ID_PROMISE_20263	0x0D38
+#define PCI_DEVICE_ID_PROMISE_20263	0x0d38
 #define PCI_DEVICE_ID_PROMISE_20268	0x4d68

But still not necessary, if you think, it's useless -- but why don't have whole
document formatted in one way. However this patch needs a -fix if ACKed due to
bad regexp used (omitted '*' changes only the first uppercase letter found). If

Hell yes :/, every second time I post something, somebody is missing in the CC
list, grr.

thanks,
--js
-

[ message continues ]

Get rid of what?  What's wrong with upper case hex numbers?  This seems

Care to resend your other fixes to me, if you still think they are
needed?

thanks,

greg k-h
-

[ message continues ]

Sure.

regards,
-- 
http://www.fi.muni.cz/~xslaby/            Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
B674 9967 0407 CE62 ACC8  22A0 32CC 55C3 39D4 7A7E
-

[ message continues ]