staging: comedi: addi_common: remove addi_find_boardinfo()

All the users of the addi_common code now set the dev->board_ptr
before calling addi_auto_attach(). Remove the unnecessary function
that searches for the boardinfo.

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-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index e9a4b43fda713bfad394b9081997583a7cd67e33..3140880948e1b1e0d49d623273cd9755bef024f4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -84,23 +84,6 @@ static int i_ADDI_Reset(struct comedi_device *dev)
        return 0;
 }
 
-static const void *addi_find_boardinfo(struct comedi_device *dev,
-                                      struct pci_dev *pcidev)
-{
-       const void *p = dev->driver->board_name;
-       const struct addi_board *this_board;
-       int i;
-
-       for (i = 0; i < dev->driver->num_names; i++) {
-               this_board = p;
-               if (this_board->i_VendorId == pcidev->vendor &&
-                   this_board->i_DeviceId == pcidev->device)
-                       return this_board;
-               p += dev->driver->offset;
-       }
-       return NULL;
-}
-
 static int addi_auto_attach(struct comedi_device *dev,
                                      unsigned long context_unused)
 {
@@ -111,13 +94,6 @@ static int addi_auto_attach(struct comedi_device *dev,
        int ret, n_subdevices;
        unsigned int dw_Dummy;
 
-       if (!this_board) {
-               /* The driver did not set the board_ptr, try finding it. */
-               this_board = addi_find_boardinfo(dev, pcidev);
-               if (!this_board)
-                       return -ENODEV;
-               dev->board_ptr = this_board;
-       }
        dev->board_name = this_board->pc_DriverName;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);