Commit f0bd6d35 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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



Factor the "find pci device" code out of the attach function.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16dd84f5

drivers/staging/comedi/drivers/contec_pci_dio.c

+50 −42
Original line number Diff line number Diff line
@@ -97,9 +97,32 @@ static int contec_di_insn_bits(struct comedi_device *dev, 
	return insn->n;

}



static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)

static struct pci_dev *contec_find_pci_dev(struct comedi_device *dev,

					   struct comedi_devconfig *it)

{

	struct pci_dev *pcidev = NULL;



	for_each_pci_dev(pcidev) {

		if (pcidev->vendor == PCI_VENDOR_ID_CONTEC &&

		    pcidev->device == PCI_DEVICE_ID_PIO1616L) {

			if (it->options[0] || it->options[1]) {

				/* Check bus and slot. */

				if (it->options[0] != pcidev->bus->number ||

				    it->options[1] != PCI_SLOT(pcidev->devfn)) {

					continue;

				}

			}

			dev->board_ptr = contec_boards + 0;

			return pcidev;

		}

	}

	printk("card not present!\n");

	return NULL;

}



static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	struct pci_dev *pcidev;

	struct comedi_subdevice *s;

	int ret;
@@ -114,27 +137,18 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	if (ret)

		return ret;



	for_each_pci_dev(pcidev) {

		if (pcidev->vendor == PCI_VENDOR_ID_CONTEC &&

		    pcidev->device == PCI_DEVICE_ID_PIO1616L) {

			if (it->options[0] || it->options[1]) {

				/* Check bus and slot. */

				if (it->options[0] != pcidev->bus->number ||

				    it->options[1] != PCI_SLOT(pcidev->devfn)) {

					continue;

				}

			}

	pcidev = contec_find_pci_dev(dev, it);

	if (!pcidev)

		return -EIO;

	devpriv->pci_dev = pcidev;



	if (comedi_pci_enable(pcidev, "contec_pci_dio")) {

				printk

				    ("error enabling PCI device and request regions!\n");

		printk("error enabling PCI device and request regions!\n");

		return -EIO;

	}

	dev->iobase = pci_resource_start(pcidev, 0);

	printk(" base addr %lx ", dev->iobase);



			dev->board_ptr = contec_boards + 0;



	s = dev->subdevices + 0;



	s->type = COMEDI_SUBD_DI;
@@ -156,12 +170,6 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	return 1;

}

	}



	printk("card not present!\n");



	return -EIO;

}



static void contec_detach(struct comedi_device *dev)

{