[PATCH 40/49] staging: comedi: addi_apci_035: set board_ptr before calling addi_auto_attach()
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Mar 5 17:23:30 UTC 2013
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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/addi_apci_035.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index ea6ddb3..f296cb3 100644
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -39,14 +39,19 @@ static const struct addi_board apci035_boardtypes[] = {
},
};
+static int apci035_auto_attach(struct comedi_device *dev,
+ unsigned long context)
+{
+ dev->board_ptr = &apci035_boardtypes[0];
+
+ return addi_auto_attach(dev, context);
+}
+
static struct comedi_driver apci035_driver = {
.driver_name = "addi_apci_035",
.module = THIS_MODULE,
- .auto_attach = addi_auto_attach,
+ .auto_attach = apci035_auto_attach,
.detach = i_ADDI_Detach,
- .num_names = ARRAY_SIZE(apci035_boardtypes),
- .board_name = &apci035_boardtypes[0].pc_DriverName,
- .offset = sizeof(struct addi_board),
};
static int apci035_pci_probe(struct pci_dev *dev,
--
1.8.1.4
More information about the devel
mailing list