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

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

staging: comedi: rtd520: remove RtdPacerStopSource 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 f6104e15

drivers/staging/comedi/drivers/rtd520.c

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


/* Macros to access registers */



/* Set Pacer stop source select (write only) */

#define RtdPacerStopSource(dev, v) \

	writel(v, devpriv->las0+LAS0_PACER_STOP)



/* Set Pacer clock source select (write only) 0=external 1=internal */

#define RtdPacerClockSource(dev, v) \

	writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_SELECT)
@@ -1194,7 +1190,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ 
	/* fall into transferDone */



transferDone:

	RtdPacerStopSource(dev, 0);	/* stop on SOFTWARE stop */

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

	RtdPacerStop(dev);	/* Stop PACER */

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

	RtdInterruptMask(dev, 0);	/* mask out SAMPLE */
@@ -1463,7 +1459,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	int timer;



	/* stop anything currently running */

	RtdPacerStopSource(dev, 0);	/* stop on SOFTWARE stop */

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

	RtdPacerStop(dev);	/* make sure PACER is stopped */

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

	RtdInterruptMask(dev, 0);
@@ -1661,7 +1657,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 
{

	u16 status;



	RtdPacerStopSource(dev, 0);	/* stop on SOFTWARE stop */

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

	RtdPacerStop(dev);	/* Stop PACER */

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

	RtdInterruptMask(dev, 0);