staging: comedi: addi_apci_16xx: add defines for the PCI device ids

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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 34af45388b88c418fad695f3bd97df9530a02ec6..a04d66ce8a35f1b6175b3ce8c5792103fe499afd 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -31,6 +31,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
  */
@@ -49,12 +55,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 */
        },
 };
@@ -228,8 +234,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);