[PATCH 6/7] staging: comedi: dnya_pci10xx: remove unneeded boardinfo code

[H Hartley Sweeten]

The boardinfo code is not needed by this driver. Only one board
type is supported.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/dyna_pci10xx.c | 38 ++-------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c 
b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index a23969e..56fb35b 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -54,20 +54,6 @@ static const struct comedi_lrange range_pci1050_ai = { 3, {
 
 static const char range_codes_pci1050_ai[] = { 0x00, 0x10, 0x30 };
 
-struct boardtype {
-       const char *name;
-       int device_id;
-};
-
-static const struct boardtype boardtypes[] = {
-       {
-       .name = "dyna_pci1050",
-       .device_id = 0x1050,
-       },
-       /*  dummy entry corresponding to driver name */
-       {.name = DRV_NAME},
-};
-
 struct dyna_pci10xx_private {
        struct mutex mutex;
        unsigned long BADR3;
@@ -194,35 +180,16 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device 
*dev,
        return insn->n;
 }
 
-static const void *dyna_pci10xx_find_boardinfo(struct comedi_device *dev,
-                                              struct pci_dev *pcidev)
-{
-       const struct boardtype *thisboard;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(boardtypes); ++i) {
-               thisboard = &boardtypes[i];
-               if (pcidev->device != thisboard->device_id)
-                       return thisboard;
-       }
-       return NULL;
-}
-
 static int dyna_pci10xx_attach_pci(struct comedi_device *dev,
                                   struct pci_dev *pcidev)
 {
-       const struct boardtype *thisboard;
        struct dyna_pci10xx_private *devpriv;
        struct comedi_subdevice *s;
        int ret;
 
        comedi_set_hw_dev(dev, &pcidev->dev);
 
-       thisboard = dyna_pci10xx_find_boardinfo(dev, pcidev);
-       if (!thisboard)
-               return -ENODEV;
-       dev->board_ptr = thisboard;
-       dev->board_name = thisboard->name;
+       dev->board_name = dev->driver->driver_name;
 
        ret = alloc_private(dev, sizeof(*devpriv));
        if (ret)
@@ -282,8 +249,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device 
*dev,
        s->state = 0;
        s->insn_bits = dyna_pci10xx_do_insn_bits;
 
-       dev_info(dev->class_dev, "%s: %s attached\n",
-               dev->driver->driver_name, dev->board_name);
+       dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
        return 0;
 }
-- 
1.7.11

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/