diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-14 17:34:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 05:09:08 -0700 |
| commit | 2967d0ae4cd00acd764f3d6fc426a99304ef3712 (patch) | |
| tree | 0e05788c85b89db10266a9e4a06ba2dd59b255ec /drivers/staging/comedi | |
| parent | 6dc71205fc2e87ff68f5d60ffe632013587bc26c (diff) | |
staging: comedi: ni_65xx: 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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index c4174da64e73..aab2b065cd54 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -629,20 +629,6 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev, return 2; } -/* FIXME: remove this when dynamic MITE allocation implemented. */ -static struct mite_struct *ni_65xx_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_65xx_board * ni_65xx_find_boardinfo(struct pci_dev *pcidev) { @@ -672,9 +658,9 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev, if (!dev->board_ptr) return -ENODEV; - private(dev)->mite = ni_65xx_find_mite(pcidev); + private(dev)->mite = mite_alloc(pcidev); if (!private(dev)->mite) - return -ENODEV; + return -ENOMEM; ret = mite_setup(private(dev)->mite); if (ret < 0) { @@ -810,8 +796,10 @@ static void ni_65xx_detach(struct comedi_device *dev) kfree(s->private); s->private = NULL; } - if (private(dev)->mite) + if (private(dev)->mite) { mite_unsetup(private(dev)->mite); + mite_free(private(dev)->mite); + } } } |