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

staging: comedi: ni_660x: 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:28 +01:00 • committed by Greg Kroah-Hartman
parent 2967d0ae4c
commit 05ac0635a5
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/comedi/drivers/ni_660x.c
View file

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