Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53a7a1bb438245cd2ef9674b9af3a5201d7d7657

Authored by Jiri Slaby
Committed by Linus Torvalds
1 parent 55b29a728e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Char: applicom, use pci_match_id 

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.

[akpm@linux-foundation.org: remove wrongly-added semicolon]
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 11 deletions Side-by-side Diff

drivers/char/applicom.c
Diff comments   View file @ 53a7a1b
... ... @@ -57,7 +57,6 @@
57 57 #define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
58 58 #define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
59 59 #endif
60   -#define MAX_PCI_DEVICE_NUM 3
61 60  
62 61 static char *applicom_pci_devnames[] = {
63 62 "PCI board",
... ... @@ -66,12 +65,9 @@
66 65 };
67 66  
68 67 static struct pci_device_id applicom_pci_tbl[] = {
69   - { PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
70   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
71   - { PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN,
72   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
73   - { PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000PFB,
74   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
  68 + { PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC) },
  69 + { PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN) },
  70 + { PCI_VDEVICE(APPLICOM, PCI_DEVICE_ID_APPLICOM_PCI2000PFB) },
75 71 { 0 }
76 72 };
77 73 MODULE_DEVICE_TABLE(pci, applicom_pci_tbl);
... ... @@ -197,10 +193,7 @@
197 193  
198 194 while ( (dev = pci_get_class(PCI_CLASS_OTHERS << 16, dev))) {
199 195  
200   - if (dev->vendor != PCI_VENDOR_ID_APPLICOM)
201   - continue;
202   -
203   - if (dev->device > MAX_PCI_DEVICE_NUM || dev->device == 0)
  196 + if (!pci_match_id(applicom_pci_tbl, dev))
204 197 continue;
205 198  
206 199 if (pci_enable_device(dev))