diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-14 17:34:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 05:09:09 -0700 |
| commit | f822a6a1a11759f0a694a4a3547c1186e1a2eaec (patch) | |
| tree | 92224cde4240cb20f5b8aa8218ff62f97ff2f24a /drivers | |
| parent | e4ff75b58a2475c9aafe1d137aa81bcba90aa379 (diff) | |
| download | linux-3.10-f822a6a1a11759f0a694a4a3547c1186e1a2eaec.tar.gz linux-3.10-f822a6a1a11759f0a694a4a3547c1186e1a2eaec.tar.bz2 linux-3.10-f822a6a1a11759f0a694a4a3547c1186e1a2eaec.zip | |
staging: comedi: ni_pcidio: 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')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 778a005dd9f..acbed139ac1 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -1103,20 +1103,6 @@ static int pci_6534_upload_firmware(struct comedi_device *dev) return ret; } -/* FIXME: remove this when dynamic MITE allocation implemented. */ -static struct mite_struct *nidio_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 nidio_board * nidio_find_boardinfo(struct pci_dev *pcidev) { @@ -1146,9 +1132,9 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev, dev->board_ptr = nidio_find_boardinfo(pcidev); if (!dev->board_ptr) return -ENODEV; - devpriv->mite = nidio_find_mite(pcidev); + devpriv->mite = mite_alloc(pcidev); if (!devpriv->mite) - return -ENODEV; + return -ENOMEM; ret = mite_setup(devpriv->mite); if (ret < 0) { @@ -1223,8 +1209,10 @@ static void nidio_detach(struct comedi_device *dev) mite_free_ring(devpriv->di_mite_ring); devpriv->di_mite_ring = NULL; } - if (devpriv->mite) + if (devpriv->mite) { mite_unsetup(devpriv->mite); + mite_free(devpriv->mite); + } } } |