staging: comedi: addi_apci_1564: set board_ptr before calling addi_auto_attach()

This driver only supports a single PCI device. If we set the
dev->board_ptr before calling addi_auto_attach() we remove
the need for the common code to search for the boardinfo.

Since the search is not done we can remove the unnecessary
board information from the comedi_driver.

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_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index b2b3bdbb9f30d3ff2238b0538258fbb530bcb309..97e389f4e5c6de853c57dc0480af6d72f8cc2eb2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -36,14 +36,19 @@ static const struct addi_board apci1564_boardtypes[] = {
        },
 };
 
+static int apci1564_auto_attach(struct comedi_device *dev,
+                               unsigned long context)
+{
+       dev->board_ptr = &apci1564_boardtypes[0];
+
+       return addi_auto_attach(dev, context);
+}
+
 static struct comedi_driver apci1564_driver = {
        .driver_name    = "addi_apci_1564",
        .module         = THIS_MODULE,
-       .auto_attach    = addi_auto_attach,
+       .auto_attach    = apci1564_auto_attach,
        .detach         = i_ADDI_Detach,
-       .num_names      = ARRAY_SIZE(apci1564_boardtypes),
-       .board_name     = &apci1564_boardtypes[0].pc_DriverName,
-       .offset         = sizeof(struct addi_board),
 };
 
 static int apci1564_pci_probe(struct pci_dev *dev,