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

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

staging: comedi: c6xdigio: remove subdevice pointer math 



Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bf4a7a7

drivers/staging/comedi/drivers/c6xdigio.c

+3 −3
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int c6xdigio_attach(struct comedi_device *dev, 
	else if (irq == 0)

		printk(KERN_DEBUG "comedi%d: no irq\n", dev->minor);



	s = dev->subdevices + 0;

	s = &dev->subdevices[0];

	/* pwm output subdevice */

	s->type = COMEDI_SUBD_AO;	/*  Not sure what to put here */

	s->subdev_flags = SDF_WRITEABLE;
@@ -458,7 +458,7 @@ static int c6xdigio_attach(struct comedi_device *dev, 
	s->maxdata = 500;

	s->range_table = &range_bipolar10;	/*  A suitable lie */



	s = dev->subdevices + 1;

	s = &dev->subdevices[1];

	/* encoder (counter) subdevice */

	s->type = COMEDI_SUBD_COUNTER;

	s->subdev_flags = SDF_READABLE | SDF_LSAMPL;
@@ -468,7 +468,7 @@ static int c6xdigio_attach(struct comedi_device *dev, 
	s->maxdata = 0xffffff;

	s->range_table = &range_unknown;



	/*	s = dev->subdevices + 2; */

	/*	s = &dev->subdevices[2]; */

	/* pwm output subdevice */

	/*	s->type = COMEDI_SUBD_COUNTER;  // Not sure what to put here */

	/*	s->subdev_flags = SDF_WRITEABLE; */