From f822a6a1a11759f0a694a4a3547c1186e1a2eaec Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:32 +0100 Subject: 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: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_pcidio.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'drivers') diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 778a005dd9f..acbed139ac1 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -1103,20 +1103,6 @@ static int pci_6534_upload_firmware(struct comedi_device *dev) 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 * nidio_find_boardinfo(struct pci_dev *pcidev) { @@ -1146,9 +1132,9 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev, dev->board_ptr = nidio_find_boardinfo(pcidev); if (!dev->board_ptr) return -ENODEV; - devpriv->mite = nidio_find_mite(pcidev); + devpriv->mite = mite_alloc(pcidev); if (!devpriv->mite) - return -ENODEV; + return -ENOMEM; ret = mite_setup(devpriv->mite); if (ret < 0) { @@ -1223,8 +1209,10 @@ static void nidio_detach(struct comedi_device *dev) mite_free_ring(devpriv->di_mite_ring); devpriv->di_mite_ring = NULL; } - if (devpriv->mite) + if (devpriv->mite) { mite_unsetup(devpriv->mite); + mite_free(devpriv->mite); + } } } -- cgit v1.2.3