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

staging: comedi: s526: rename s526_ai_config 



For aesthetic reasons, rename the private data variable
's526_ai_config' to simply 'ai_config'. Its private data
and does not need the 's526_' namespace.

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

drivers/staging/comedi/drivers/s526.c

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ union cmReg { 
struct s526_private {

	unsigned int ao_readback[2];

	unsigned int gpct_config[4];

	unsigned short s526_ai_config;

	unsigned short ai_config;

};



static int s526_gpct_rinsn(struct comedi_device *dev,
@@ -416,11 +416,11 @@ static int s526_ai_insn_config(struct comedi_device *dev, 


	/*  Enable ADC interrupt */

	outw(ISR_ADC_DONE, dev->iobase + REG_IER);

	devpriv->s526_ai_config = (data[0] & 0x3FF) << 5;

	devpriv->ai_config = (data[0] & 0x3ff) << 5;

	if (data[1] > 0)

		devpriv->s526_ai_config |= 0x8000;	/* set the delay */

		devpriv->ai_config |= 0x8000;	/* set the delay */



	devpriv->s526_ai_config |= 0x0001;	/*  ADC start bit. */

	devpriv->ai_config |= 0x0001;		/* ADC start bit */



	return result;

}
@@ -437,7 +437,7 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 


	/* Set configured delay, enable channel for this channel only,

	 * select "ADC read" channel, set "ADC start" bit. */

	value = (devpriv->s526_ai_config & 0x8000) |

	value = (devpriv->ai_config & 0x8000) |

		((1 << 5) << chan) | (chan << 1) | 0x0001;



	/* convert n samples */