staging: comedi: adl_pci9118: use 'context' in (*auto_attach)

The pci_device_id 'driver_data' is passed as the 'context' when the (*auto_attach)
mechanism is used to attach this driver. Add a boardid enum and index the boardinfo
so that the "pci9118dg" boardinfo is automatically selected. This allow removing
the pci9118_find_boardinfo() helper.

Unfortunately all the boards supported by this driver have the same device id.
Add commented out entries in the device table for them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 333c68f5d5a235be3412913ccaf519fee61b2c2a..dc0d0cb795bfd6db0b01fa38c05d7e1944b6f2fa 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -228,6 +228,12 @@ static const struct comedi_lrange pci9118hg_ai_range = {
                                         * of BIP/UNI ranges
                                         */
 
+enum pci9118_boardid {
+       BOARD_PCI9118DG,
+       BOARD_PCI9118HG,
+       BOARD_PCI9118HR,
+};
+
 struct boardtype {
        const char *name;               /* board name */
        int device_id;                  /* PCI device ID of card */
@@ -236,14 +242,16 @@ struct boardtype {
 };
 
 static const struct boardtype boardtypes[] = {
-       {
+       [BOARD_PCI9118DG] = {
                .name           = "pci9118dg",
                .device_id      = 0x80d9,
-       }, {
+       },
+       [BOARD_PCI9118HG] = {
                .name           = "pci9118hg",
                .device_id      = 0x80d9,
                .is_hg          = 1,
-       }, {
+       },
+       [BOARD_PCI9118HR] = {
                .name           = "pci9118hr",
                .device_id      = 0x80d9,
                .ai_is_16bit    = 1,
@@ -1732,20 +1740,6 @@ static int pci9118_reset(struct comedi_device *dev)
        return 0;
 }
 
-/*
- * FIXME - this is pretty ineffective because all the supported board types
- * have the same device ID!
- */
-static const struct boardtype *pci9118_find_boardinfo(struct pci_dev *pcidev)
-{
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(boardtypes); i++)
-               if (pcidev->device == boardtypes[i].device_id)
-                       return &boardtypes[i];
-       return NULL;
-}
-
 static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
                                        struct comedi_devconfig *it)
 {
@@ -1959,22 +1953,23 @@ static int pci9118_attach(struct comedi_device *dev,
 }
 
 static int pci9118_auto_attach(struct comedi_device *dev,
-                                        unsigned long context_unused)
+                              unsigned long context)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+       const struct boardtype *board = NULL;
        struct pci9118_private *devpriv;
 
+       if (context < ARRAY_SIZE(boardtypes))
+               board = &boardtypes[context];
+       if (!board)
+               return -ENODEV;
+       dev->board_ptr = board;
+       dev->board_name = board->name;
+
        devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
        if (!devpriv)
                return -ENOMEM;
 
-       dev->board_ptr = pci9118_find_boardinfo(pcidev);
-       if (dev->board_ptr == NULL) {
-               dev_err(dev->class_dev,
-                       "adl_pci9118: cannot determine board type for pci %s\n",
-                       pci_name(pcidev));
-               return -EINVAL;
-       }
        /*
         * Need to 'get' the PCI device to match the 'put' in pci9118_detach().
         * (The 'put' also matches the implicit 'get' by pci9118_find_pci().)
@@ -2023,8 +2018,11 @@ static int adl_pci9118_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
+/* FIXME: All the supported board types have the same device ID! */
 static const struct pci_device_id adl_pci9118_pci_table[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80d9) },
+       { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118DG },
+/*     { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118HG }, */
+/*     { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118HR }, */
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, adl_pci9118_pci_table);