Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03afcf47 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cleanup comedi_alloc_subdevices 



Access the individual comedi_subdevices using a pointer instead
of directly accessing as an array. This is how the rest of the
comedi core accesses them.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbott@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b6c5694

drivers/staging/comedi/drivers.c

+11 −8
Original line number Diff line number Diff line
@@ -58,21 +58,24 @@ struct comedi_driver *comedi_drivers; 


int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)

{

	struct comedi_subdevice *s;

	int i;



	if (num_subdevices < 1)

		return -EINVAL;

	dev->subdevices =

	    kcalloc(num_subdevices, sizeof(struct comedi_subdevice),

		    GFP_KERNEL);

	if (!dev->subdevices)



	s = kcalloc(num_subdevices, sizeof(*s), GFP_KERNEL);

	if (!s)

		return -ENOMEM;

	dev->subdevices = s;

	dev->n_subdevices = num_subdevices;



	for (i = 0; i < num_subdevices; ++i) {

		dev->subdevices[i].device = dev;

		dev->subdevices[i].async_dma_dir = DMA_NONE;

		spin_lock_init(&dev->subdevices[i].spin_lock);

		dev->subdevices[i].minor = -1;

		s = dev->subdevices + i;

		s->device = dev;

		s->async_dma_dir = DMA_NONE;

		spin_lock_init(&s->spin_lock);

		s->minor = -1;

	}

	return 0;

}