Skip to content

Commit

Permalink
staging: comedi: addi_apci_1564: set board_ptr before calling addi_au…
Browse files Browse the repository at this point in the history
…to_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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent a80cb91 commit 43ba213
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/staging/comedi/drivers/addi_apci_1564.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 43ba213

Please sign in to comment.