]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: comedi: addi_apci_1710: remove boardinfo
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 5 Mar 2013 17:26:23 +0000 (10:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Mar 2013 17:05:23 +0000 (10:05 -0700)
This driver only uses the boardinfo to get the dev->board_name.
Just use the dev->driver->driver_name and remove the unnecessary
boardinfo completely.

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>
drivers/staging/comedi/drivers/addi_apci_1710.c

index 068b0169f4c7ad4c8d4ea8ee06d208083fb3d167..f654eb03473a20a2e020a9e2867ed5ad48b954c3 100644 (file)
@@ -21,49 +21,21 @@ static void fpu_end(void)
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_APCI1710.c"
 
-static const struct addi_board apci1710_boardtypes[] = {
-       {
-               .pc_DriverName          = "apci1710",
-               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
-               .i_DeviceId             = APCI1710_BOARD_DEVICE_ID,
-       },
-};
-
 static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 {
        v_APCI1710_Interrupt(irq, d);
        return IRQ_RETVAL(1);
 }
 
-static const void *apci1710_find_boardinfo(struct comedi_device *dev,
-                                          struct pci_dev *pcidev)
-{
-       const struct addi_board *this_board;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(apci1710_boardtypes); i++) {
-               this_board = &apci1710_boardtypes[i];
-               if (this_board->i_VendorId == pcidev->vendor &&
-                   this_board->i_DeviceId == pcidev->device)
-                       return this_board;
-       }
-       return NULL;
-}
-
 static int apci1710_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       const struct addi_board *this_board;
        struct addi_private *devpriv;
        struct comedi_subdevice *s;
        int ret;
 
-       this_board = apci1710_find_boardinfo(dev, pcidev);
-       if (!this_board)
-               return -ENODEV;
-       dev->board_ptr = this_board;
-       dev->board_name = this_board->pc_DriverName;
+       dev->board_name = dev->driver->driver_name;
 
        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
        if (!devpriv)