leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: cb_pcidas64: 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:42:36 -07:00 committed by Greg Kroah-Hartman
parent c5866e7850
commit eeff9dbc6f
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/staging/comedi/drivers/cb_pcidas64.c
View File

@ -1650,26 +1650,11 @@ static inline void warn_external_queue(struct comedi_device *dev)
"Use internal AI channel queue (channels must be consecutive and use same range/aref)"); "Use internal AI channel queue (channels must be consecutive and use same range/aref)");
} }
/* static struct pci_dev *cb_pcidas64_find_pci_dev(struct comedi_device *dev,
* Attach is called by the Comedi core to configure the driver struct comedi_devconfig *it)
* for a particular board.
*/
static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
struct pci_dev *pcidev = NULL; struct pci_dev *pcidev = NULL;
int index; int index;
uint32_t local_range, local_decode;
int retval;
/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(struct pcidas64_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) {
/* is it not a computer boards card? */ /* is it not a computer boards card? */
@ -1687,22 +1672,38 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
continue; continue;
} }
} }
priv(dev)->hw_dev = pcidev;
dev->board_ptr = pcidas64_boards + index; dev->board_ptr = pcidas64_boards + index;
break; dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
board(dev)->name,
pcidev->bus->number, PCI_SLOT(pcidev->devfn));
return pcidev;
} }
if (dev->board_ptr)
break;
} }
if (dev->board_ptr == NULL) { printk("No supported ComputerBoards/MeasurementComputing card found\n");
printk return NULL;
("No supported ComputerBoards/MeasurementComputing card found\n"); }
/*
* Attach is called by the Comedi core to configure the driver
* for a particular board.
*/
static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct pci_dev *pcidev;
uint32_t local_range, local_decode;
int retval;
/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(struct pcidas64_private)) < 0)
return -ENOMEM;
pcidev = cb_pcidas64_find_pci_dev(dev, it);
if (!pcidev)
return -EIO; return -EIO;
} priv(dev)->hw_dev = pcidev;
dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
board(dev)->name, pcidev->bus->number, PCI_SLOT(pcidev->devfn));
if (comedi_pci_enable(pcidev, dev->driver->driver_name)) { if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
dev_warn(dev->class_dev, dev_warn(dev->class_dev,