staging: comedi: adv_pci1723: 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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 21dfde29316788fbf5b3ffbef28da61abaa00e8c..63f0985c6fc4ae5ec6e3c41ebcc55355a6e153fb 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -238,50 +238,21 @@ static int pci1723_dio_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static struct pci_dev *pci1723_find_pci_dev(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 (bus || slot) {
-                       if (bus != pcidev->bus->number ||
-                           slot != PCI_SLOT(pcidev->devfn))
-                               continue;
-               }
-               if (pcidev->vendor != PCI_VENDOR_ID_ADVANTECH)
-                       continue;
-               if (pcidev->device != 0x1723)
-                       continue;
-               return pcidev;
-       }
-       dev_err(dev->class_dev,
-               "No supported board found! (req. bus %d, slot %d)\n",
-               bus, slot);
-       return NULL;
-}
-
-static int pci1723_attach(struct comedi_device *dev,
-                         struct comedi_devconfig *it)
+static int pci1723_attach_pci(struct comedi_device *dev,
+                             struct pci_dev *pcidev)
 {
        struct pci1723_private *devpriv;
-       struct pci_dev *pcidev;
        struct comedi_subdevice *s;
        int ret;
 
+       comedi_set_hw_dev(dev, &pcidev->dev);
+       dev->board_name = dev->driver->driver_name;
+
        ret = alloc_private(dev, sizeof(*devpriv));
        if (ret < 0)
                return ret;
        devpriv = dev->private;
 
-       pcidev = pci1723_find_pci_dev(dev, it);
-       if (!pcidev)
-               return -EIO;
-       comedi_set_hw_dev(dev, &pcidev->dev);
-       dev->board_name = dev->driver->driver_name;
-
        ret = comedi_pci_enable(pcidev, dev->board_name);
        if (ret)
                return ret;
@@ -353,14 +324,13 @@ static void pci1723_detach(struct comedi_device *dev)
        if (pcidev) {
                if (dev->iobase)
                        comedi_pci_disable(pcidev);
-               pci_dev_put(pcidev);
        }
 }
 
 static struct comedi_driver adv_pci1723_driver = {
        .driver_name    = "adv_pci1723",
        .module         = THIS_MODULE,
-       .attach         = pci1723_attach,
+       .attach_pci     = pci1723_attach_pci,
        .detach         = pci1723_detach,
 };