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

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

staging: comedi: rtd520: remove RtdBurstStartSource 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 99e3cfc2

drivers/staging/comedi/drivers/rtd520.c

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


/* Macros to access registers */



/* Set burst start source select (write only) */

#define RtdBurstStartSource(dev, v) \

	writel(v, devpriv->las0+LAS0_BURST_START)



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

#define RtdPacerStartSource(dev, v) \

	writel(v, devpriv->las0+LAS0_PACER_START)
@@ -1504,7 +1500,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	if (cmd->chanlist_len > 1) {

		/*DPRINTK ("rtd520: Multi channel setup\n"); */

		RtdPacerStartSource(dev, 0);	/* software triggers pacer */

		RtdBurstStartSource(dev, 1);	/* PACER triggers burst */

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

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

	} else {		/* single channel */

		/*DPRINTK ("rtd520: single channel setup\n"); */
@@ -1614,7 +1610,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
		break;



	case TRIG_EXT:		/* external */

		RtdBurstStartSource(dev, 2);	/* EXTERNALy trigger burst */

		writel(2, devpriv->las0 + LAS0_BURST_START);

		break;



	default: