From: H Hartley Sweeten Date: Wed, 11 Jul 2012 00:10:27 +0000 (-0700) Subject: staging: comedi: rtd520: remove RtdDacRange macro X-Git-Tag: v3.6-rc1~100^2~241 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9db311d1c2587bbc6773498636397234bf2b34ad;p=platform%2Fkernel%2Flinux-exynos.git staging: comedi: rtd520: remove RtdDacRange 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 'writew'. Remove the macro. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index ebe74bf..8cd056c 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -406,11 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Set DAC output type and range */ -#define RtdDacRange(dev, n, v) \ - writew((v) & 7, devpriv->las0 \ - +(((n) == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL)) - /* Reset DAC FIFO */ #define RtdDacClearFifo(dev, n) \ writel(0, devpriv->las0+(((n) == 0) ? LAS0_DAC1_RESET : \ @@ -1538,7 +1533,8 @@ static int rtd_ao_winsn(struct comedi_device *dev, int range = CR_RANGE(insn->chanspec); /* Configure the output range (table index matches the range values) */ - RtdDacRange(dev, chan, range); + writew(range & 7, devpriv->las0 + + ((chan == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL)); /* Writing a list of values to an AO channel is probably not * very useful, but that's how the interface is defined. */