mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

staging: comedi: cb_pcidio: factor out the "find pci device" code

Browse source 
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:
H Hartley Sweeten 2012-07-18 18:36:08 -07:00 committed by Greg Kroah-Hartman
parent ba36b9ba76
commit 41f7ea34f5
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/staging/comedi/drivers/cb_pcidio.c
View file

@ -111,27 +111,11 @@ struct pcidio_private {
*/
#define devpriv ((struct pcidio_private *)dev->private)
static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev,
struct comedi_devconfig *it)
{
struct pci_dev *pcidev = NULL;
int index;
int i;
int ret;
/*
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
return -ENOMEM;
/*
* If you can probe the device to determine what device in a series
* it is, this is the place to do it. Otherwise, dev->board_ptr
* should already be initialized.
*/
/*
* Probe the device to determine what device in the series it is.
*/
for_each_pci_dev(pcidev) {
/* is it not a computer boards card? */
@ -151,15 +135,32 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
dev->board_ptr = pcidio_boards + index;
goto found;
dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
thisboard->name, devpriv->pci_dev->bus->number,
PCI_SLOT(devpriv->pci_dev->devfn));
return pcidev;
}
}
dev_err(dev->class_dev,
"No supported ComputerBoards/MeasurementComputing card found on requested position\n");
return -EIO;
return NULL;
}
found:
static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
int i;
int ret;
/*
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
return -ENOMEM;
devpriv->pci_dev = pcidio_find_pci_dev(dev, it);
if (!devpriv->pci_dev)
return -EIO;
/*
* Initialize dev->board_name. Note that we can use the "thisboard"
@ -167,17 +168,12 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
dev->board_name = thisboard->name;
devpriv->pci_dev = pcidev;
dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
thisboard->name, devpriv->pci_dev->bus->number,
PCI_SLOT(devpriv->pci_dev->devfn));
if (comedi_pci_enable(pcidev, thisboard->name))
if (comedi_pci_enable(devpriv->pci_dev, thisboard->name))
return -EIO;
devpriv->dio_reg_base
=
pci_resource_start(devpriv->pci_dev,
pcidio_boards[index].dioregs_badrindex);
pci_resource_start(devpriv->pci_dev, thisboard->dioregs_badrindex);
ret = comedi_alloc_subdevices(dev, thisboard->n_8255);
if (ret)