A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

staging: comedi: rtd520: remove RtdPacerStop macro

Browse source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-07-10 16:52:14 -07:00 • committed by Greg Kroah-Hartman
commit 5d4a93438d
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/rtd520.c
View file

@ -406,10 +406,6 @@ struct rtdPrivate {
/* Macros to access registers */
/* pacer start/stop read=start, write=stop*/
#define RtdPacerStop(dev) \
writel(0, devpriv->las0+LAS0_PACER)
/* Interrupt status */
#define RtdInterruptStatus(dev) \
readw(devpriv->las0+LAS0_IT)
@ -1152,7 +1148,7 @@ abortTransfer:
transferDone:
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); /* mask out SAMPLE */
#ifdef USE_DMA
@ -1421,7 +1417,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* stop anything currently running */
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* make sure PACER is stopped */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
#ifdef USE_DMA
@ -1619,7 +1615,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
u16 status;
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
devpriv->aiCount = 0; /* stop and don't transfer any more */