diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-14 17:34:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 05:09:08 -0700 |
| commit | 05ac0635a52836face9acadbc4ffe25ed2f6828a (patch) | |
| tree | 7b2f4d25e02934725cc145acbf905e897b3ffa77 /drivers/staging/comedi | |
| parent | 2967d0ae4cd00acd764f3d6fc426a99304ef3712 (diff) | |
staging: comedi: ni_660x: 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_660x.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 3b125a6c9fb6..d3c8e6a513ea 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -1034,20 +1034,6 @@ static void ni_660x_free_mite_rings(struct comedi_device *dev) } } -/* FIXME: remove this when dynamic MITE allocation implemented. */ -static struct mite_struct *ni_660x_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_660x_board * ni_660x_find_boardinfo(struct pci_dev *pcidev) { @@ -1076,9 +1062,9 @@ static int __devinit ni_660x_attach_pci(struct comedi_device *dev, dev->board_ptr = ni_660x_find_boardinfo(pcidev); if (!dev->board_ptr) return -ENODEV; - private(dev)->mite = ni_660x_find_mite(pcidev); + private(dev)->mite = mite_alloc(pcidev); if (!private(dev)->mite) - return -ENODEV; + return -ENOMEM; dev->board_name = board(dev)->name; @@ -1196,6 +1182,7 @@ static void ni_660x_detach(struct comedi_device *dev) if (private(dev)->mite) { ni_660x_free_mite_rings(dev); mite_unsetup(private(dev)->mite); + mite_free(private(dev)->mite); } } } |