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

staging: comedi: ni_labpc: 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 604d66ce
...@@ -696,20 +696,6 @@ labpc_pci_find_boardinfo(struct pci_dev *pcidev) ...@@ -696,20 +696,6 @@ labpc_pci_find_boardinfo(struct pci_dev *pcidev)
return NULL; return NULL;
} }
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *labpc_pci_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 int __devinit labpc_attach_pci(struct comedi_device *dev, static int __devinit labpc_attach_pci(struct comedi_device *dev,
struct pci_dev *pcidev) struct pci_dev *pcidev)
{ {
...@@ -725,9 +711,9 @@ static int __devinit labpc_attach_pci(struct comedi_device *dev, ...@@ -725,9 +711,9 @@ static int __devinit labpc_attach_pci(struct comedi_device *dev,
dev->board_ptr = labpc_pci_find_boardinfo(pcidev); dev->board_ptr = labpc_pci_find_boardinfo(pcidev);
if (!dev->board_ptr) if (!dev->board_ptr)
return -ENODEV; return -ENODEV;
devpriv->mite = labpc_pci_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)
return ret; return ret;
...@@ -800,8 +786,10 @@ void labpc_common_detach(struct comedi_device *dev) ...@@ -800,8 +786,10 @@ void labpc_common_detach(struct comedi_device *dev)
if (thisboard->bustype == isa_bustype && dev->iobase) if (thisboard->bustype == isa_bustype && dev->iobase)
release_region(dev->iobase, LABPC_SIZE); release_region(dev->iobase, LABPC_SIZE);
#ifdef CONFIG_COMEDI_PCI_DRIVERS #ifdef CONFIG_COMEDI_PCI_DRIVERS
if (devpriv->mite) if (devpriv->mite) {
mite_unsetup(devpriv->mite); mite_unsetup(devpriv->mite);
mite_free(devpriv->mite);
}
#endif #endif
}; };
EXPORT_SYMBOL_GPL(labpc_common_detach); EXPORT_SYMBOL_GPL(labpc_common_detach);
......
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