staging: comedi: ni_pcimio: use mite_alloc()

Allocate `struct mite_device` dynamically instead of searching for
one on the `mite_devices` list constructed by the "mite" module.

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_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 523734696a8317e741ba941cea20d2724038fb3b..f284a90720ecef0cc455c9af0918d4bd236eab87 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1581,25 +1581,13 @@ static void pcimio_detach(struct comedi_device *dev)
                mite_free_ring(devpriv->cdo_mite_ring);
                mite_free_ring(devpriv->gpct_mite_ring[0]);
                mite_free_ring(devpriv->gpct_mite_ring[1]);
-               if (devpriv->mite)
+               if (devpriv->mite) {
                        mite_unsetup(devpriv->mite);
+                       mite_free(devpriv->mite);
+               }
        }
 }
 
-/* FIXME: remove this when dynamic MITE allocation implemented. */
-static struct mite_struct *pcimio_find_mite(struct pci_dev *pcidev)
-{
-       struct mite_struct *mite;
-
-       for (mite = mite_devices; mite; mite = mite->next) {
-               if (mite->used)
-                       continue;
-               if (mite->pcidev == pcidev)
-                       return mite;
-       }
-       return NULL;
-}
-
 static const struct ni_board_struct *
 pcimio_find_boardinfo(struct pci_dev *pcidev)
 {
@@ -1629,9 +1617,9 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev,
        if (!dev->board_ptr)
                return -ENODEV;
 
-       devpriv->mite = pcimio_find_mite(pcidev);
+       devpriv->mite = mite_alloc(pcidev);
        if (!devpriv->mite)
-               return -ENODEV;
+               return -ENOMEM;
 
        dev_dbg(dev->class_dev, "%s\n", boardtype.name);
        dev->board_name = boardtype.name;