From 7b93ca01cdbbd25a7c58a66ab7e1598567052a52 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 16:46:37 -0700 Subject: [PATCH] --- yaml --- r: 317896 b: refs/heads/master c: 896a64dd6cbea51e18cf5ba43982d781f92c2e59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d8be20f5f812..6f06c5bfcc4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d137eb4c989396e7574d5037e2cb531de299daa +refs/heads/master: 896a64dd6cbea51e18cf5ba43982d781f92c2e59 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index 6636b26c8c68..ecdc7e461d32 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -406,10 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Set Pacer clock source select (write only) 0=external 1=internal */ -#define RtdPacerClockSource(dev, v) \ - writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_SELECT) - /* Set sample counter source select (write only) */ #define RtdAdcSampleCounterSource(dev, v) \ writel(v, devpriv->las0+LAS0_ADC_SCNT_SRC) @@ -1544,7 +1540,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->transCount = 0; devpriv->flags &= ~SEND_EOS; } - RtdPacerClockSource(dev, 1); /* use INTERNAL 8Mhz clock source */ + writel(1, devpriv->las0 + LAS0_PACER_SELECT); RtdAboutStopEnable(dev, 1); /* just interrupt, dont stop */ /* BUG??? these look like enumerated values, but they are bit fields */