From: H Hartley Sweeten Date: Wed, 11 Jul 2012 00:09:31 +0000 (-0700) Subject: staging: comedi: rtd520: remove RtdDacUpdate macro X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=58f1fde22e3d1faffcc8d0e5b5fa62bd9d9ee5d4;p=deliverable%2Flinux.git staging: comedi: rtd520: remove RtdDacUpdate 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 8ba7877d5228..e81939c0f8c2 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -406,10 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Start single DAC conversion */ -#define RtdDacUpdate(dev, n) \ - writew(0, devpriv->las0 + (((n) == 0) ? LAS0_DAC1 : LAS0_DAC2)) - /* Start single DAC conversion on both DACs */ #define RtdDacBothUpdate(dev) \ writew(0, devpriv->las0+LAS0_DAC) @@ -1572,7 +1568,7 @@ static int rtd_ao_winsn(struct comedi_device *dev, /* a typical programming sequence */ writew(val, devpriv->las1 + ((chan == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO)); - RtdDacUpdate(dev, chan); /* trigger the conversion */ + writew(0, devpriv->las0 + ((chan == 0) ? LAS0_DAC1 : LAS0_DAC2)); devpriv->aoValue[chan] = data[i]; /* save for read back */