Commit a5cf79e3 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: 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 f822a6a1

drivers/staging/comedi/drivers/ni_pcimio.c

+5 −17
Original line number Diff line number Diff line
@@ -1581,23 +1581,11 @@ static void pcimio_detach(struct comedi_device *dev) 
		mite_free_ring(devpriv->cdo_mite_ring);

		mite_free_ring(devpriv->gpct_mite_ring[0]);

		mite_free_ring(devpriv->gpct_mite_ring[1]);

		if (devpriv->mite)

		if (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 *
@@ -1629,9 +1617,9 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev, 
	if (!dev->board_ptr)

		return -ENODEV;



	devpriv->mite = pcimio_find_mite(pcidev);

	devpriv->mite = mite_alloc(pcidev);

	if (!devpriv->mite)

		return -ENODEV;

		return -ENOMEM;



	dev_dbg(dev->class_dev, "%s\n", boardtype.name);

	dev->board_name = boardtype.name;