From: H Hartley Sweeten Date: Tue, 10 Jul 2012 23:48:22 +0000 (-0700) Subject: staging: comedi: rtd520: remove RtdAboutStopEnable macro X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dcfbb64cc108435ae336f9b44014212a02f6bdf1;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: rtd520: remove RtdAboutStopEnable 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: 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 f3fea5ab87a0..df505a3d0ee6 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 */ -/* Set About counter stop enable (write only) */ -#define RtdAboutStopEnable(dev, v) \ - writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ACNT_STOP_ENABLE) - /* Set external trigger polarity (write only) 0=positive edge, 1=negative */ #define RtdTriggerPolarity(dev, v) \ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ETRG_POLARITY) @@ -1533,7 +1529,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->flags &= ~SEND_EOS; } writel(1, devpriv->las0 + LAS0_PACER_SELECT); - RtdAboutStopEnable(dev, 1); /* just interrupt, dont stop */ + writel(1, devpriv->las0 + LAS0_ACNT_STOP_ENABLE); /* BUG??? these look like enumerated values, but they are bit fields */