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

staging: comedi: ni_pcidio: 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 e4ff75b5
...@@ -1103,20 +1103,6 @@ static int pci_6534_upload_firmware(struct comedi_device *dev) ...@@ -1103,20 +1103,6 @@ static int pci_6534_upload_firmware(struct comedi_device *dev)
return ret; return ret;
} }
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *nidio_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 nidio_board * static const struct nidio_board *
nidio_find_boardinfo(struct pci_dev *pcidev) nidio_find_boardinfo(struct pci_dev *pcidev)
{ {
...@@ -1146,9 +1132,9 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev, ...@@ -1146,9 +1132,9 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev,
dev->board_ptr = nidio_find_boardinfo(pcidev); dev->board_ptr = nidio_find_boardinfo(pcidev);
if (!dev->board_ptr) if (!dev->board_ptr)
return -ENODEV; return -ENODEV;
devpriv->mite = nidio_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) {
...@@ -1223,8 +1209,10 @@ static void nidio_detach(struct comedi_device *dev) ...@@ -1223,8 +1209,10 @@ static void nidio_detach(struct comedi_device *dev)
mite_free_ring(devpriv->di_mite_ring); mite_free_ring(devpriv->di_mite_ring);
devpriv->di_mite_ring = NULL; devpriv->di_mite_ring = NULL;
} }
if (devpriv->mite) if (devpriv->mite) {
mite_unsetup(devpriv->mite); mite_unsetup(devpriv->mite);
mite_free(devpriv->mite);
}
} }
} }
......
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