Skip to content

Commit

Permalink
staging: comedi: ni_660x: use mite_alloc()
Browse files Browse the repository at this point in the history
Allocate `struct mite_device` dynamically instead of searching for
one on the `mite_devices` list constructed by the "mite" module.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 2967d0a commit 05ac063
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions drivers/staging/comedi/drivers/ni_660x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,20 +1034,6 @@ static void ni_660x_free_mite_rings(struct comedi_device *dev)
}
}

/* FIXME: remove this when dynamic MITE allocation implemented. */
static struct mite_struct *ni_660x_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_660x_board *
ni_660x_find_boardinfo(struct pci_dev *pcidev)
{
Expand Down Expand Up @@ -1076,9 +1062,9 @@ static int __devinit ni_660x_attach_pci(struct comedi_device *dev,
dev->board_ptr = ni_660x_find_boardinfo(pcidev);
if (!dev->board_ptr)
return -ENODEV;
private(dev)->mite = ni_660x_find_mite(pcidev);
private(dev)->mite = mite_alloc(pcidev);
if (!private(dev)->mite)
return -ENODEV;
return -ENOMEM;

dev->board_name = board(dev)->name;

Expand Down Expand Up @@ -1196,6 +1182,7 @@ static void ni_660x_detach(struct comedi_device *dev)
if (private(dev)->mite) {
ni_660x_free_mite_rings(dev);
mite_unsetup(private(dev)->mite);
mite_free(private(dev)->mite);
}
}
}
Expand Down

0 comments on commit 05ac063

Please sign in to comment.