staging: comedi: cb_pcidda: factor out the "find pci device" code
Factor the "find pci device" code out of the attach function. 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>
This commit is contained in:
parent
000e263502
commit
84b2d57c0b
1 changed files with 32 additions and 28 deletions
|
@ -255,27 +255,11 @@ static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev,
|
||||||
static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
|
static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
|
||||||
unsigned int range);
|
unsigned int range);
|
||||||
|
|
||||||
/*
|
static struct pci_dev *cb_pcidda_find_pci_dev(struct comedi_device *dev,
|
||||||
* Attach is called by the Comedi core to configure the driver
|
|
||||||
* for a particular board.
|
|
||||||
*/
|
|
||||||
static int cb_pcidda_attach(struct comedi_device *dev,
|
|
||||||
struct comedi_devconfig *it)
|
struct comedi_devconfig *it)
|
||||||
{
|
{
|
||||||
struct comedi_subdevice *s;
|
|
||||||
struct pci_dev *pcidev = NULL;
|
struct pci_dev *pcidev = NULL;
|
||||||
int index;
|
int index;
|
||||||
int ret;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Allocate the private structure area.
|
|
||||||
*/
|
|
||||||
if (alloc_private(dev, sizeof(struct cb_pcidda_private)) < 0)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Probe the device to determine what device in the series it is.
|
|
||||||
*/
|
|
||||||
|
|
||||||
for_each_pci_dev(pcidev) {
|
for_each_pci_dev(pcidev) {
|
||||||
if (pcidev->vendor == PCI_VENDOR_ID_CB) {
|
if (pcidev->vendor == PCI_VENDOR_ID_CB) {
|
||||||
|
@ -288,22 +272,42 @@ static int cb_pcidda_attach(struct comedi_device *dev,
|
||||||
for (index = 0; index < ARRAY_SIZE(cb_pcidda_boards); index++) {
|
for (index = 0; index < ARRAY_SIZE(cb_pcidda_boards); index++) {
|
||||||
if (cb_pcidda_boards[index].device_id ==
|
if (cb_pcidda_boards[index].device_id ==
|
||||||
pcidev->device) {
|
pcidev->device) {
|
||||||
goto found;
|
dev->board_ptr = cb_pcidda_boards + index;
|
||||||
|
dev_dbg(dev->class_dev,
|
||||||
|
"Found %s at requested position\n",
|
||||||
|
thisboard->name);
|
||||||
|
return pcidev;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!pcidev) {
|
|
||||||
dev_err(dev->class_dev,
|
dev_err(dev->class_dev,
|
||||||
"Not a ComputerBoards/MeasurementComputing card on requested position\n");
|
"Not a ComputerBoards/MeasurementComputing card on requested position\n");
|
||||||
return -EIO;
|
return NULL;
|
||||||
}
|
}
|
||||||
found:
|
|
||||||
|
/*
|
||||||
|
* Attach is called by the Comedi core to configure the driver
|
||||||
|
* for a particular board.
|
||||||
|
*/
|
||||||
|
static int cb_pcidda_attach(struct comedi_device *dev,
|
||||||
|
struct comedi_devconfig *it)
|
||||||
|
{
|
||||||
|
struct pci_dev *pcidev;
|
||||||
|
struct comedi_subdevice *s;
|
||||||
|
int index;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Allocate the private structure area.
|
||||||
|
*/
|
||||||
|
if (alloc_private(dev, sizeof(struct cb_pcidda_private)) < 0)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
pcidev = cb_pcidda_find_pci_dev(dev, it);
|
||||||
|
if (!pcidev)
|
||||||
|
return -EIO;
|
||||||
devpriv->pci_dev = pcidev;
|
devpriv->pci_dev = pcidev;
|
||||||
dev->board_ptr = cb_pcidda_boards + index;
|
|
||||||
/* "thisboard" macro can be used from here. */
|
|
||||||
dev_dbg(dev->class_dev, "Found %s at requested position\n",
|
|
||||||
thisboard->name);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enable PCI device and request regions.
|
* Enable PCI device and request regions.
|
||||||
|
|
Reference in a new issue