Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: adl_pci7432: factor out the PCI device code 



Factor out the code that finds a matching PCI device from attach
function. This allows reducing the indent level of the remaining
code in the attach function.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3ff7b93

drivers/staging/comedi/drivers/adl_pci7432.c

+58 −54
Original line number Diff line number Diff line
@@ -88,18 +88,39 @@ static int adl_pci7432_di_insn_bits(struct comedi_device *dev, 
	return 2;

}



static int adl_pci7432_attach(struct comedi_device *dev,

static struct pci_dev *adl_pci7432_find_pci(struct comedi_device *dev,

					    struct comedi_devconfig *it)

{

	struct pci_dev *pcidev = NULL;

	int bus = it->options[0];

	int slot = it->options[1];



	for_each_pci_dev(pcidev) {

		if (pcidev->vendor != PCI_VENDOR_ID_ADLINK ||

		    pcidev->device != PCI_DEVICE_ID_PCI7432)

			continue;

		if (bus || slot) {

			/* requested particular bus/slot */

			if (pcidev->bus->number != bus ||

			    PCI_SLOT(pcidev->devfn) != slot)

				continue;

		}

		return pcidev;

	}

	printk(KERN_ERR

		"comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",

	       dev->minor, bus, slot);

	return NULL;

}



static int adl_pci7432_attach(struct comedi_device *dev,

			      struct comedi_devconfig *it)

{

	struct comedi_subdevice *s;

	int bus, slot;



	printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);



	dev->board_name = "pci7432";

	bus = it->options[0];

	slot = it->options[1];



	if (alloc_private(dev, sizeof(struct adl_pci7432_private)) < 0)

		return -ENOMEM;
@@ -107,30 +128,21 @@ static int adl_pci7432_attach(struct comedi_device *dev, 
	if (alloc_subdevices(dev, 2) < 0)

		return -ENOMEM;



	for_each_pci_dev(pcidev) {

		if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&

		    pcidev->device == PCI_DEVICE_ID_PCI7432) {

			if (bus || slot) {

				/* requested particular bus/slot */

				if (pcidev->bus->number != bus

				    || PCI_SLOT(pcidev->devfn) != slot) {

					continue;

				}

			}

			devpriv->pci_dev = pcidev;

			if (comedi_pci_enable(pcidev, "adl_pci7432") < 0) {

	devpriv->pci_dev = adl_pci7432_find_pci(dev, it);

	if (!devpriv->pci_dev)

		return -EIO;



	if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7432") < 0) {

		printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",

			dev->minor);

		return -EIO;

	}

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

			printk(KERN_INFO "comedi: base addr %4lx\n",

				dev->iobase);

	dev->iobase = pci_resource_start(devpriv->pci_dev, 2);

	printk(KERN_INFO "comedi: base addr %4lx\n", dev->iobase);



	s = dev->subdevices + 0;

	s->type = COMEDI_SUBD_DI;

			s->subdev_flags =

			    SDF_READABLE | SDF_GROUND | SDF_COMMON;

	s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;

	s->n_chan = 32;

	s->maxdata = 1;

	s->len_chanlist = 32;
@@ -140,8 +152,7 @@ static int adl_pci7432_attach(struct comedi_device *dev, 


	s = dev->subdevices + 1;

	s->type = COMEDI_SUBD_DO;

			s->subdev_flags =

			    SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

	s->n_chan = 32;

	s->maxdata = 1;

	s->len_chanlist = 32;
@@ -149,15 +160,8 @@ static int adl_pci7432_attach(struct comedi_device *dev, 
	s->range_table = &range_digital;

	s->insn_bits = adl_pci7432_do_insn_bits;



			printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",

				dev->minor);

			return 1;

		}

	}



	printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",

	       dev->minor, bus, slot);

	return -EIO;

	printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n", dev->minor);

	return 0;

}



static void adl_pci7432_detach(struct comedi_device *dev)