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

staging: comedi: ni_65xx: 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 6dc71205
...@@ -629,20 +629,6 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev, ...@@ -629,20 +629,6 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev,
return 2; return 2;
} }
/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *ni_65xx_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_65xx_board * static const struct ni_65xx_board *
ni_65xx_find_boardinfo(struct pci_dev *pcidev) ni_65xx_find_boardinfo(struct pci_dev *pcidev)
{ {
...@@ -672,9 +658,9 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev, ...@@ -672,9 +658,9 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev,
if (!dev->board_ptr) if (!dev->board_ptr)
return -ENODEV; return -ENODEV;
private(dev)->mite = ni_65xx_find_mite(pcidev); private(dev)->mite = mite_alloc(pcidev);
if (!private(dev)->mite) if (!private(dev)->mite)
return -ENODEV; return -ENOMEM;
ret = mite_setup(private(dev)->mite); ret = mite_setup(private(dev)->mite);
if (ret < 0) { if (ret < 0) {
...@@ -810,8 +796,10 @@ static void ni_65xx_detach(struct comedi_device *dev) ...@@ -810,8 +796,10 @@ static void ni_65xx_detach(struct comedi_device *dev)
kfree(s->private); kfree(s->private);
s->private = NULL; s->private = NULL;
} }
if (private(dev)->mite) if (private(dev)->mite) {
mite_unsetup(private(dev)->mite); mite_unsetup(private(dev)->mite);
mite_free(private(dev)->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