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

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

staging: comedi: ni_labpc: tidy up subdevice init 



Add some whitespace to the subdevice init.

Remove the unnecessary comment about adding command support to
the analog input subdevice and change the 'maxdata' value to hex
as this is more common in comedi drivers.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 370c8e1f

drivers/staging/comedi/drivers/ni_labpc.c

+27 −30
Original line number Diff line number Diff line
@@ -1673,7 +1673,6 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, 
#ifdef CONFIG_ISA_DMA_API

	unsigned long dma_flags;

#endif

	short lsb, msb;

	int ret;



	dev_info(dev->class_dev, "ni_labpc: %s\n", board->name);
@@ -1775,20 +1774,18 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, 
	/* analog output */

	s = &dev->subdevices[1];

	if (board->has_ao) {

		/*

		 * Could provide command support, except it only has a

		 * one sample hardware buffer for analog output and no

		 * underrun flag.

		 */

		s->type		= COMEDI_SUBD_AO;

		s->subdev_flags	= SDF_READABLE | SDF_WRITABLE | SDF_GROUND;

		s->n_chan	= NUM_AO_CHAN;

		s->maxdata = (1 << 12) - 1;	/*  12 bit resolution */

		s->maxdata	= 0x0fff;

		s->range_table	= &range_labpc_ao;

		s->insn_read	= labpc_ao_insn_read;

		s->insn_write	= labpc_ao_insn_write;



		/* initialize analog outputs to a known value */

		for (i = 0; i < s->n_chan; i++) {

			short lsb, msb;



			devpriv->ao_value[i] = s->maxdata / 2;

			lsb = devpriv->ao_value[i] & 0xff;

			msb = (devpriv->ao_value[i] >> 8) & 0xff;
@@ -1832,7 +1829,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, 
		s->insn_read	= labpc_eeprom_insn_read;

		s->insn_write	= labpc_eeprom_insn_write;



		for (i = 0; i < EEPROM_SIZE; i++)

		for (i = 0; i < s->n_chan; i++)

			devpriv->eeprom_data[i] = labpc_eeprom_read(dev, i);

	} else

		s->type		= COMEDI_SUBD_UNUSED;