evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_pcimio: use mite_alloc()

Browse source 
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>
This commit is contained in:
Ian Abbott 2012-09-14 17:34:33 +01:00 • committed by Greg Kroah-Hartman
parent f822a6a1a1
commit a5cf79e3ac
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/comedi/drivers/ni_pcimio.c
View file

@ -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;