staging: comedi: addi_apci_16xx: use the pci id_table 'driver_data'

Create an enum to the boardinfo and pass that enum in the pci_driver
id_table as the driver_data.

Change the macro used to fill in the device table from PCI_DEVICE() to
PCI_VDEVICE(). This allows passing the enum as the next field.

This allows removing the 'vendor' and 'device' data from the boardinfo
as well the search function that was used to locate the boardinfo for
the PCI device.

Since the PCI device ids are now only used in the id_table, remove the
defines and open code the device ids.

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 12ff76a73d8a2030e398df3564fd0c66fe92efdc..4117de96994f2d04f8ef58651d94ca9486e985fd 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -33,12 +33,6 @@
 
 #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
  */
@@ -46,23 +40,23 @@
 #define APCI16XX_OUT_REG(x)            (((x) * 4) + 0x14)
 #define APCI16XX_DIR_REG(x)            (((x) * 4) + 0x20)
 
+enum apci16xx_boardid {
+       BOARD_APCI1648,
+       BOARD_APCI1696,
+};
+
 struct apci16xx_boardinfo {
        const char *name;
-       unsigned short vendor;
-       unsigned short device;
        int n_chan;
 };
 
 static const struct apci16xx_boardinfo apci16xx_boardtypes[] = {
-       {
+       [BOARD_APCI1648] = {
                .name           = "apci1648",
-               .vendor         = PCI_VENDOR_ID_ADDIDATA,
-               .device         = PCI_DEVICE_ID_APCI1648,
                .n_chan         = 48,           /* 2 subdevices */
-       }, {
+       },
+       [BOARD_APCI1696] = {
                .name           = "apci1696",
-               .vendor         = PCI_VENDOR_ID_ADDIDATA,
-               .device         = PCI_DEVICE_ID_APCI1696,
                .n_chan         = 96,           /* 3 subdevices */
        },
 };
@@ -130,33 +124,19 @@ static int apci16xx_dio_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static const void *apci16xx_find_boardinfo(struct comedi_device *dev,
-                                          struct pci_dev *pcidev)
-{
-       const struct apci16xx_boardinfo *board;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(apci16xx_boardtypes); i++) {
-               board = &apci16xx_boardtypes[i];
-               if (board->vendor == pcidev->vendor &&
-                   board->device == pcidev->device)
-                       return board;
-       }
-       return NULL;
-}
-
 static int apci16xx_auto_attach(struct comedi_device *dev,
-                               unsigned long context_unused)
+                               unsigned long context)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       const struct apci16xx_boardinfo *board;
+       const struct apci16xx_boardinfo *board = NULL;
        struct comedi_subdevice *s;
        unsigned int n_subdevs;
        unsigned int last;
        int i;
        int ret;
 
-       board = apci16xx_find_boardinfo(dev, pcidev);
+       if (context < ARRAY_SIZE(apci16xx_boardtypes))
+               board = &apci16xx_boardtypes[context];
        if (!board)
                return -ENODEV;
        dev->board_ptr = board;
@@ -231,8 +211,8 @@ static int apci16xx_pci_probe(struct pci_dev *dev,
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = {
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1648) },
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1696) },
+       { PCI_VDEVICE(ADDIDATA, 0x1009), BOARD_APCI1648 },
+       { PCI_VDEVICE(ADDIDATA, 0x100a), BOARD_APCI1696 },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, apci16xx_pci_table);