提交 a5cf79e3 编写于 作者: I Ian Abbott 提交者: Greg Kroah-Hartman

staging: comedi: ni_pcimio: 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: NIan Abbott <abbotti@mev.co.uk>
Reviewed-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 f822a6a1
...@@ -1581,25 +1581,13 @@ static void pcimio_detach(struct comedi_device *dev) ...@@ -1581,25 +1581,13 @@ static void pcimio_detach(struct comedi_device *dev)
mite_free_ring(devpriv->cdo_mite_ring); mite_free_ring(devpriv->cdo_mite_ring);
mite_free_ring(devpriv->gpct_mite_ring[0]); mite_free_ring(devpriv->gpct_mite_ring[0]);
mite_free_ring(devpriv->gpct_mite_ring[1]); mite_free_ring(devpriv->gpct_mite_ring[1]);
if (devpriv->mite) if (devpriv->mite) {
mite_unsetup(devpriv->mite); mite_unsetup(devpriv->mite);
mite_free(devpriv->mite);
}
} }
} }
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *pcimio_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_board_struct * static const struct ni_board_struct *
pcimio_find_boardinfo(struct pci_dev *pcidev) pcimio_find_boardinfo(struct pci_dev *pcidev)
{ {
...@@ -1629,9 +1617,9 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev, ...@@ -1629,9 +1617,9 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev,
if (!dev->board_ptr) if (!dev->board_ptr)
return -ENODEV; return -ENODEV;
devpriv->mite = pcimio_find_mite(pcidev); devpriv->mite = mite_alloc(pcidev);
if (!devpriv->mite) if (!devpriv->mite)
return -ENODEV; return -ENOMEM;
dev_dbg(dev->class_dev, "%s\n", boardtype.name); dev_dbg(dev->class_dev, "%s\n", boardtype.name);
dev->board_name = boardtype.name; dev->board_name = boardtype.name;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册