staging: comedi: ke_counter: cleanup "find pci device" code
Cleanup the "find pci device" code so that it follows the style of the other comedi pci drivers. 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
bd8a9bc167
commit
a890062bb7
|
@ -125,49 +125,35 @@ static int cnt_rinsn(struct comedi_device *dev,
|
||||||
static struct pci_dev *cnt_find_pci_dev(struct comedi_device *dev,
|
static struct pci_dev *cnt_find_pci_dev(struct comedi_device *dev,
|
||||||
struct comedi_devconfig *it)
|
struct comedi_devconfig *it)
|
||||||
{
|
{
|
||||||
struct cnt_board_struct *board;
|
const struct cnt_board_struct *board;
|
||||||
struct pci_dev *pci_device = NULL;
|
struct pci_dev *pcidev = NULL;
|
||||||
|
int bus = it->options[0];
|
||||||
|
int slot = it->options[1];
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Probe the device to determine what device in the series it is. */
|
/* Probe the device to determine what device in the series it is. */
|
||||||
for_each_pci_dev(pci_device) {
|
for_each_pci_dev(pcidev) {
|
||||||
if (pci_device->vendor == PCI_VENDOR_ID_KOLTER) {
|
if (bus || slot) {
|
||||||
for (i = 0; i < cnt_board_nbr; i++) {
|
if (pcidev->bus->number != bus ||
|
||||||
if (cnt_boards[i].device_id ==
|
PCI_SLOT(pcidev->devfn) != slot)
|
||||||
pci_device->device) {
|
|
||||||
/* was a particular bus/slot requested? */
|
|
||||||
if ((it->options[0] != 0)
|
|
||||||
|| (it->options[1] != 0)) {
|
|
||||||
/* are we on the wrong bus/slot? */
|
|
||||||
if (pci_device->bus->number !=
|
|
||||||
it->options[0]
|
|
||||||
||
|
|
||||||
PCI_SLOT(pci_device->devfn)
|
|
||||||
!= it->options[1]) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
if (pcidev->vendor != PCI_VENDOR_ID_KOLTER)
|
||||||
|
continue;
|
||||||
|
|
||||||
dev->board_ptr = cnt_boards + i;
|
for (i = 0; i < cnt_board_nbr; i++) {
|
||||||
board =
|
board = &cnt_boards[i];
|
||||||
(struct cnt_board_struct *)
|
if (board->device_id != pcidev->device)
|
||||||
dev->board_ptr;
|
continue;
|
||||||
goto found;
|
|
||||||
|
dev->board_ptr = board;
|
||||||
|
return pcidev;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
dev_err(dev->class_dev,
|
||||||
}
|
"No supported board found! (req. bus %d, slot %d)\n",
|
||||||
printk(KERN_WARNING
|
bus, slot);
|
||||||
"comedi%d: no supported board found! (req. bus/slot: %d/%d)\n",
|
|
||||||
dev->minor, it->options[0], it->options[1]);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
found:
|
|
||||||
printk(KERN_INFO
|
|
||||||
"comedi%d: found %s at PCI bus %d, slot %d\n", dev->minor,
|
|
||||||
board->name, pci_device->bus->number,
|
|
||||||
PCI_SLOT(pci_device->devfn));
|
|
||||||
return pci_device;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
||||||
|
|
Loading…
Reference in New Issue