staging: comedi: ni_670x: use comedi attach_pci callback

Convert this PCI driver to use the comedi `attach_pci` callback instead
of the `attach` callback for PCI auto-configuration.  There is no need
to support manual attachment of PCI devices supported by this driver, so
remove the `attach` callback altogether.

Note that this driver still uses the list of PCI "mite" devices created
by the "mite" module.  This will be dealt with by a later patch once
dynamic allocation of "mite" structures has been implemented.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index cdb36b8f041e58db39efc392742333f4d8187940..1783219fe75d3256f1967b828cfd0bfdbff38ba5 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -187,37 +187,36 @@ static int ni_670x_dio_insn_config(struct comedi_device *dev,
        return insn->n;
 }
 
-static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot)
+/* FIXME: remove this when dynamic MITE allocation implemented. */
+static struct mite_struct *ni_670x_find_mite(struct pci_dev *pcidev)
 {
-       struct ni_670x_private *devpriv = dev->private;
        struct mite_struct *mite;
-       int i;
 
        for (mite = mite_devices; mite; mite = mite->next) {
                if (mite->used)
                        continue;
-               if (bus || slot) {
-                       if (bus != mite->pcidev->bus->number
-                           || slot != PCI_SLOT(mite->pcidev->devfn))
-                               continue;
-               }
+               if (mite->pcidev == pcidev)
+                       return mite;
+       }
+       return NULL;
+}
 
-               for (i = 0; i < ARRAY_SIZE(ni_670x_boards); i++) {
-                       if (mite_device_id(mite) == ni_670x_boards[i].dev_id) {
-                               dev->board_ptr = ni_670x_boards + i;
-                               devpriv->mite = mite;
+static const struct ni_670x_board *
+ni_670x_find_boardinfo(struct pci_dev *pcidev)
+{
+       unsigned int dev_id = pcidev->device;
+       unsigned int n;
 
-                               return 0;
-                       }
-               }
+       for (n = 0; n < ARRAY_SIZE(ni_670x_boards); n++) {
+               const struct ni_670x_board *board = &ni_670x_boards[n];
+               if (board->dev_id == dev_id)
+                       return board;
        }
-       dev_warn(dev->class_dev, "no device found\n");
-       mite_list_devices();
-       return -EIO;
+       return NULL;
 }
 
-static int ni_670x_attach(struct comedi_device *dev,
-                         struct comedi_devconfig *it)
+static int __devinit ni_670x_attach_pci(struct comedi_device *dev,
+                                       struct pci_dev *pcidev)
 {
        const struct ni_670x_board *thisboard;
        struct ni_670x_private *devpriv;
@@ -229,10 +228,12 @@ static int ni_670x_attach(struct comedi_device *dev,
        if (ret < 0)
                return ret;
        devpriv = dev->private;
-
-       ret = ni_670x_find_device(dev, it->options[0], it->options[1]);
-       if (ret < 0)
-               return ret;
+       dev->board_ptr = ni_670x_find_boardinfo(pcidev);
+       if (!dev->board_ptr)
+               return -ENODEV;
+       devpriv->mite = ni_670x_find_mite(pcidev);
+       if (!devpriv->mite)
+               return -ENODEV;
        thisboard = comedi_board(dev);
 
        ret = mite_setup(devpriv->mite);
@@ -311,7 +312,7 @@ static void ni_670x_detach(struct comedi_device *dev)
 static struct comedi_driver ni_670x_driver = {
        .driver_name    = "ni_670x",
        .module         = THIS_MODULE,
-       .attach         = ni_670x_attach,
+       .attach_pci     = ni_670x_attach_pci,
        .detach         = ni_670x_detach,
 };