Home » Mailing list archives » linux-kernel » 2008 » January » 30

[PATCH 2/2] Char: applicom, use pci_match_id

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jiri Slaby <jirislaby@...>
To: Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, <dwmw2@...>, Jiri Slaby <jirislaby@...>, WANG Cong <xiyou.wangcong@...>
Subject: [PATCH 2/2] Char: applicom, use pci_match_id
Date: Wednesday, January 30, 2008 - 7:13 am

Instead of testing hardcoded values, use pci_match_id to reference the
pci_device_id table. Sideways, it allows easy new additions to the table.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
---
 drivers/char/applicom.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index b0bb71b..64bf71c 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -57,7 +57,6 @@
 #define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
 #define PCI_DEVICE_ID_APPLICOM_PCI2000PFB     0x0003
 #endif
-#define MAX_PCI_DEVICE_NUM 3
 
 static char *applicom_pci_devnames[] = {
 	"PCI board",
@@ -66,12 +65,9 @@ static char *applicom_pci_devnames[] = {
 };
 
 static struct pci_device_id applicom_pci_tbl[] = {
-	{ PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000PFB,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	{ PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC) },
+	{ PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN) },
+	{ PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000PFB) },
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, applicom_pci_tbl);
@@ -197,10 +193,7 @@ static int __init applicom_init(void)
 
 	while ( (dev = pci_get_class(PCI_CLASS_OTHERS << 16, dev))) {
 
-		if (dev->vendor != PCI_VENDOR_ID_APPLICOM)
-			continue;
-		
-		if (dev->device  > MAX_PCI_DEVICE_NUM || dev->device == 0)
+		if (!pci_match_id(applicom_pci_tbl, dev));
 			continue;
 		
 		if (pci_enable_device(dev))
-- 
1.5.3.8

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[Patch] Shut up warnings from files under drivers/, WANG Cong, (Sat Jan 26, 5:30 am)
Re: [Patch] Shut up warnings from files under drivers/, Sam Ravnborg, (Sat Jan 26, 5:57 am)
Re: [Patch] Shut up warnings from files under drivers/, Sam Ravnborg, (Sat Jan 26, 6:21 am)
Re: [Patch] Shut up warnings from files under drivers/, WANG Cong, (Sat Jan 26, 6:26 am)
Re: [Patch] Shut up warnings from files under drivers/, WANG Cong, (Sat Jan 26, 6:15 am)
Re: [Patch] Shut up warnings from files under drivers/, Jeff Garzik, (Sat Jan 26, 5:55 am)
Re: [Patch] Shut up warnings from files under drivers/, Sam Ravnborg, (Sat Jan 26, 3:17 pm)
(Updated) [Patch] Shut up warnings from files under drivers/, WANG Cong, (Sun Jan 27, 12:15 am)
Re: (Updated) [Patch] Shut up warnings from files under driv..., Sam Ravnborg, (Sun Jan 27, 5:21 am)
(Try#3) [Patch] Shut up warnings from files under drivers/, WANG Cong, (Mon Jan 28, 1:49 am)
[PATCH 2/2] Char: applicom, use pci_match_id, Jiri Slaby, (Wed Jan 30, 7:13 am)
Re: [PATCH 2/2] Char: applicom, use pci_match_id, Andrew Morton, (Wed Jan 30, 7:10 pm)
Re: [PATCH 2/2] Char: applicom, use pci_match_id, Jiri Slaby, (Thu Jan 31, 5:26 am)
[PATCH 1/2] Char: applicom, use pci_resource_start, Jiri Slaby, (Wed Jan 30, 7:13 am)
Re: (Updated) [Patch] Shut up warnings from files under driv..., Jiri Slaby, (Sun Jan 27, 5:08 am)
Re: (Updated) [Patch] Shut up warnings from files under driv..., Jiri Slaby, (Sun Jan 27, 5:21 am)
Re: (Updated) [Patch] Shut up warnings from files under driv..., WANG Cong, (Mon Jan 28, 1:20 am)
Re: [Patch] Shut up warnings from files under drivers/, WANG Cong, (Sat Jan 26, 10:50 pm)
Re: [Patch] Shut up warnings from files under drivers/, Sam Ravnborg, (Sat Jan 26, 3:30 pm)
Re: [Patch] Shut up warnings from files under drivers/, WANG Cong, (Sat Jan 26, 6:18 am)
Re: [Patch] Shut up warnings from files under drivers/, Jeff Garzik, (Sat Jan 26, 7:44 am)