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

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

staging: comedi: rtd520: remove RtdAdcClearFifo 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 9b3f95cc

drivers/staging/comedi/drivers/rtd520.c

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


/* Macros to access registers */



/* Reset ADC FIFO */

#define RtdAdcClearFifo(dev) \

	writel(0, devpriv->las0+LAS0_ADC_FIFO_CLEAR)



/* Set ADC start conversion source select (write only) */

#define RtdAdcConversionSource(dev, v) \

	writel(v, devpriv->las0+LAS0_ADC_CONVERSION)
@@ -804,7 +800,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) 
	static const unsigned limit = 0x2000;

	unsigned fifo_size = 0;



	RtdAdcClearFifo(dev);

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

	rtd_load_channelgain_list(dev, 1, &chanspec);

	RtdAdcConversionSource(dev, 0);	/* software */

	/* convert  samples */
@@ -824,7 +820,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) 
		       DRV_NAME);

		return -EIO;

	}

	RtdAdcClearFifo(dev);

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

	if (fifo_size != 0x400 && fifo_size != 0x2000) {

		printk

		    (KERN_INFO "\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n",
@@ -850,7 +846,7 @@ static int rtd_ai_rinsn(struct comedi_device *dev, 
	int stat;



	/* clear any old fifo data */

	RtdAdcClearFifo(dev);

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



	/* write channel to multiplexer and clear channel gain table */

	rtd_load_channelgain_list(dev, 1, &insn->chanspec);
@@ -1204,7 +1200,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ 
	return IRQ_HANDLED;



abortTransfer:

	RtdAdcClearFifo(dev);	/* clears full flag */

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

	s->async->events |= COMEDI_CB_ERROR;

	devpriv->aiCount = 0;	/* stop and don't transfer any more */

	/* fall into transferDone */
@@ -1495,7 +1491,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	}

	RtdDma0Reset(dev);	/* reset onboard state */

#endif /* USE_DMA */

	RtdAdcClearFifo(dev);	/* clear any old data */

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

	RtdInterruptOverrunClear(dev);

	devpriv->intCount = 0;
@@ -2036,7 +2032,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	RtdInterruptClear(dev);	/* clears bits set by mask */

	RtdInterruptOverrunClear(dev);

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

	RtdAdcClearFifo(dev);

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

	RtdDacClearFifo(dev, 0);

	RtdDacClearFifo(dev, 1);

	/* clear digital IO fifo */