Commit 6dc71205 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: ni_6527: 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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca8eb8d5
...@@ -353,20 +353,6 @@ static int ni6527_intr_insn_config(struct comedi_device *dev, ...@@ -353,20 +353,6 @@ static int ni6527_intr_insn_config(struct comedi_device *dev,
return 2; 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 * static const struct ni6527_board *
ni6527_find_boardinfo(struct pci_dev *pcidev) ni6527_find_boardinfo(struct pci_dev *pcidev)
{ {
...@@ -395,9 +381,9 @@ static int __devinit ni6527_attach_pci(struct comedi_device *dev, ...@@ -395,9 +381,9 @@ static int __devinit ni6527_attach_pci(struct comedi_device *dev,
if (!dev->board_ptr) if (!dev->board_ptr)
return -ENODEV; return -ENODEV;
devpriv->mite = ni6527_find_mite(pcidev); devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite) if (!devpriv->mite)
return -ENODEV; return -ENOMEM;
ret = mite_setup(devpriv->mite); ret = mite_setup(devpriv->mite);
if (ret < 0) { if (ret < 0) {
...@@ -468,8 +454,10 @@ static void ni6527_detach(struct comedi_device *dev) ...@@ -468,8 +454,10 @@ static void ni6527_detach(struct comedi_device *dev)
devpriv->mite->daq_io_addr + Master_Interrupt_Control); devpriv->mite->daq_io_addr + Master_Interrupt_Control);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (devpriv && devpriv->mite) if (devpriv && devpriv->mite) {
mite_unsetup(devpriv->mite); mite_unsetup(devpriv->mite);
mite_free(devpriv->mite);
}
} }
static struct comedi_driver ni6527_driver = { static struct comedi_driver ni6527_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment