diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-14 17:34:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 05:09:10 -0700 |
| commit | a5cf79e3ace423360126a4eeb5089c19c99ae060 (patch) | |
| tree | 1301993cc39def1b0c417f233daaecf040559e3c /drivers/staging/comedi | |
| parent | f822a6a1a11759f0a694a4a3547c1186e1a2eaec (diff) | |
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 523734696a83..f284a90720ec 100644 --- 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; |