The PCI device ids supported by this driver are used multiple
places in the code. To improve maintainability, create #define's
for them.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/addi_apci_16xx.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c 
b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index afb41da..992090a 100644
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -32,6 +32,12 @@
 #include "../comedidev.h"
 
 /*
+ * PCI device ids supported by this driver
+ */
+#define PCI_DEVICE_ID_APCI1648         0x1009
+#define PCI_DEVICE_ID_APCI1696         0x100a
+
+/*
  * Register I/O map
  *
  * The subdevice 'index' is used to work out the actual
@@ -52,12 +58,12 @@ static const struct apci16xx_boardinfo 
apci16xx_boardtypes[] = {
        {
                .name           = "apci1648",
                .vendor         = PCI_VENDOR_ID_ADDIDATA,
-               .device         = 0x1009,
+               .device         = PCI_DEVICE_ID_APCI1648,
                .n_chan         = 48,           /* 2 subdevices */
        }, {
                .name           = "apci1696",
                .vendor         = PCI_VENDOR_ID_ADDIDATA,
-               .device         = 0x100A,
+               .device         = PCI_DEVICE_ID_APCI1696,
                .n_chan         = 96,           /* 3 subdevices */
        },
 };
@@ -232,8 +238,8 @@ static void apci16xx_pci_remove(struct pci_dev *dev)
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = {
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009) },
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100a) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1648) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1696) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, apci16xx_pci_table);
-- 
1.8.0

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to