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

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

staging: comedi: adl_pci8164: use attach_pci callback 



Convert this PCI driver to use the comedi PCI auto config attach
mechanism by adding an 'attach_pci' callback function. Since the
driver does not require any external configuration options, and
the legacy 'attach' callback is now optional, remove it.

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 180d7fc8

drivers/staging/comedi/drivers/adl_pci8164.c

+13 −52
Original line number Diff line number Diff line
@@ -27,11 +27,7 @@ Author: Michel Lachaine <mike@mikelachaine.ca> 
Status: experimental

Updated: Mon, 14 Apr 2008 15:10:32 +0100



Configuration Options:

  [0] - PCI bus of device (optional)

  [1] - PCI slot of device (optional)

  If bus/slot is not specified, the first supported

  PCI device found will be used.

Configuration Options: not applicable, uses PCI auto config

*/



#include "../comedidev.h"
@@ -216,59 +212,24 @@ static int adl_pci8164_insn_write_buf1(struct comedi_device *dev, 
	return 2;

}



static struct pci_dev *adl_pci8164_find_pci(struct comedi_device *dev,

					    struct comedi_devconfig *it)

static int adl_pci8164_attach_pci(struct comedi_device *dev,

				  struct pci_dev *pcidev)

{

	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_PCI8164)

			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_pci8164_attach(struct comedi_device *dev,

			      struct comedi_devconfig *it)

{

	struct pci_dev *pcidev;

	struct comedi_subdevice *s;

	int ret;



	printk(KERN_INFO "comedi: attempt to attach...\n");

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

	comedi_set_hw_dev(dev, &pcidev->dev);



	dev->board_name = "pci8164";

	dev->board_name = dev->driver->driver_name;



	ret = comedi_alloc_subdevices(dev, 4);

	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

		return ret;



	pcidev = adl_pci8164_find_pci(dev, it);

	if (!pcidev)

		return -EIO;

	comedi_set_hw_dev(dev, &pcidev->dev);



	if (comedi_pci_enable(pcidev, "adl_pci8164") < 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_DEBUG "comedi: base addr %4lx\n", dev->iobase);



	ret = comedi_alloc_subdevices(dev, 4);

	if (ret)

		return ret;



	s = dev->subdevices + 0;

	s->type = COMEDI_SUBD_PROC;
@@ -310,7 +271,8 @@ static int adl_pci8164_attach(struct comedi_device *dev, 
	s->insn_read = adl_pci8164_insn_read_buf1;

	s->insn_write = adl_pci8164_insn_write_buf1;



	printk(KERN_INFO "comedi: attached\n");

	dev_info(dev->class_dev, "%s attached\n", dev->board_name);



	return 0;

}
@@ -321,14 +283,13 @@ static void adl_pci8164_detach(struct comedi_device *dev) 
	if (pcidev) {

		if (dev->iobase)

			comedi_pci_disable(pcidev);

		pci_dev_put(pcidev);

	}

}



static struct comedi_driver adl_pci8164_driver = {

	.driver_name	= "adl_pci8164",

	.module		= THIS_MODULE,

	.attach		= adl_pci8164_attach,

	.attach_pci	= adl_pci8164_attach_pci,

	.detach		= adl_pci8164_detach,

};