kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: ni_6527: 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:26 +01:00 committed by Greg Kroah-Hartman
parent ca8eb8d5c8
commit 6dc71205fc
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_6527.c
View file

@ -353,20 +353,6 @@ static int ni6527_intr_insn_config(struct comedi_device *dev,
return 2;
}
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *ni6527_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 ni6527_board *
ni6527_find_boardinfo(struct pci_dev *pcidev)
{
@ -395,9 +381,9 @@ static int __devinit ni6527_attach_pci(struct comedi_device *dev,
if (!dev->board_ptr)
return -ENODEV;
devpriv->mite = ni6527_find_mite(pcidev);
devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite)
return -ENODEV;
return -ENOMEM;
ret = mite_setup(devpriv->mite);
if (ret < 0) {
@ -468,8 +454,10 @@ static void ni6527_detach(struct comedi_device *dev)
devpriv->mite->daq_io_addr + Master_Interrupt_Control);
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv && devpriv->mite)
if (devpriv && devpriv->mite) {
mite_unsetup(devpriv->mite);
mite_free(devpriv->mite);
}
}
static struct comedi_driver ni6527_driver = {