From fedcbecf7fa57cbac865c16eb6bcb05de73acb3f Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:28 +0100 Subject: [PATCH] --- yaml --- r: 325313 b: refs/heads/master c: 05ac0635a52836face9acadbc4ffe25ed2f6828a h: refs/heads/master i: 325311: 5b468432b42548025fdc7dc898fdad6ac9ccc5ec v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/ni_660x.c | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 7c33166eb156..050414927129 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2967d0ae4cd00acd764f3d6fc426a99304ef3712 +refs/heads/master: 05ac0635a52836face9acadbc4ffe25ed2f6828a diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c index 3b125a6c9fb6..d3c8e6a513ea 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_660x.c +++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c @@ -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) { @@ -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; @@ -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); } } }