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

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

staging: comedi: rtd520: remove RtdAboutCounter macro 



This macro uses the 'devpriv' macro which relies on a local variable
having a specific name. Plus it's just a wrapper around a simple
'writel'. Remove the macro.

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 50399017

drivers/staging/comedi/drivers/rtd520.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -406,10 +406,6 @@ struct rtdPrivate { 




/* Macros to access registers */

/* Macros to access registers */





/* About counter, 16bit */

#define RtdAboutCounter(dev, v) \

	writel((v) & 0xffff, devpriv->las0+LAS0_ACNT)



/* ADC sample counter, 10bit */

/* ADC sample counter, 10bit */

#define RtdAdcSampleCount(dev) \

#define RtdAdcSampleCount(dev) \

	readl(devpriv->las0+LAS0_ADC_SCNT)

	readl(devpriv->las0+LAS0_ADC_SCNT)
@@ -1418,7 +1414,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
		writel(0, devpriv->las0 + LAS0_PACER_START);

		writel(0, devpriv->las0 + LAS0_PACER_START);

		writel(1, devpriv->las0 + LAS0_ADC_CONVERSION);

		writel(1, devpriv->las0 + LAS0_ADC_CONVERSION);

	}

	}

	RtdAboutCounter(dev, devpriv->fifoLen / 2 - 1);	/* 1/2 FIFO */

	writel((devpriv->fifoLen / 2 - 1) & 0xffff, devpriv->las0 + LAS0_ACNT);





	if (TRIG_TIMER == cmd->scan_begin_src) {

	if (TRIG_TIMER == cmd->scan_begin_src) {

		/* scan_begin_arg is in nanoseconds */

		/* scan_begin_arg is in nanoseconds */
@@ -1452,7 +1448,8 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
			devpriv->flags &= ~SEND_EOS;

			devpriv->flags &= ~SEND_EOS;

		} else {

		} else {

			/* interrupt for each transfer */

			/* interrupt for each transfer */

			RtdAboutCounter(dev, devpriv->transCount - 1);

			writel((devpriv->transCount - 1) & 0xffff,

				devpriv->las0 + LAS0_ACNT);

		}

		}





		DPRINTK

		DPRINTK