staging: comedi: ni_670x: 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_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 1783219fe75d3256f1967b828cfd0bfdbff38ba5..fb83625065f5bd34ab6537adc266119d10772744 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -187,20 +187,6 @@ static int ni_670x_dio_insn_config(struct comedi_device *dev,
        return insn->n;
 }
 
-/* FIXME: remove this when dynamic MITE allocation implemented. */
-static struct mite_struct *ni_670x_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_670x_board *
 ni_670x_find_boardinfo(struct pci_dev *pcidev)
 {
@@ -231,9 +217,9 @@ static int __devinit ni_670x_attach_pci(struct comedi_device *dev,
        dev->board_ptr = ni_670x_find_boardinfo(pcidev);
        if (!dev->board_ptr)
                return -ENODEV;
-       devpriv->mite = ni_670x_find_mite(pcidev);
+       devpriv->mite = mite_alloc(pcidev);
        if (!devpriv->mite)
-               return -ENODEV;
+               return -ENOMEM;
        thisboard = comedi_board(dev);
 
        ret = mite_setup(devpriv->mite);
@@ -303,8 +289,10 @@ static void ni_670x_detach(struct comedi_device *dev)
                if (s)
                        kfree(s->range_table_list);
        }
-       if (devpriv && devpriv->mite)
+       if (devpriv && devpriv->mite) {
                mite_unsetup(devpriv->mite);
+               mite_free(devpriv->mite);
+       }
        if (dev->irq)
                free_irq(dev->irq, dev);
 }