diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-26 23:01:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 00:16:22 +0100 |
| commit | 2cc71f0406f651ac3a5420c942614fb1104a18ad (patch) | |
| tree | 492be6de6aff280e0a315047f79684934610572f | |
| parent | staging: comedi: rtd520: remove intClearMask from private data (diff) | |
| download | linux-2cc71f0406f651ac3a5420c942614fb1104a18ad.tar.xz linux-2cc71f0406f651ac3a5420c942614fb1104a18ad.zip | |
staging: comedi: rtd520: remove utcCtrl from private data
This variable in the private data is not necessary. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 5d7e385b3807..7183355d12ca 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -412,9 +412,6 @@ struct rtdPrivate { /* timer gate (when enabled) */ u8 utcGate[4]; /* 1 extra allows simple range check */ - /* shadow registers affect other registers, but can't be read back */ - /* The macros below update these on writes */ - u8 utcCtrl[4]; /* crtl mode for 3 utc + read back */ unsigned fifoLen; }; @@ -1325,14 +1322,10 @@ static void rtd_init_board(struct comedi_device *dev) writel(0, devpriv->las0 + LAS0_DAC2_RESET); /* clear digital IO fifo */ writew(0, devpriv->las0 + LAS0_DIO_STATUS); - devpriv->utcCtrl[0] = (0 << 6) | 0x30; - devpriv->utcCtrl[1] = (1 << 6) | 0x30; - devpriv->utcCtrl[2] = (2 << 6) | 0x30; - devpriv->utcCtrl[3] = (3 << 6) | 0x00; - writeb(devpriv->utcCtrl[0], devpriv->las0 + LAS0_UTC_CTRL); - writeb(devpriv->utcCtrl[1], devpriv->las0 + LAS0_UTC_CTRL); - writeb(devpriv->utcCtrl[2], devpriv->las0 + LAS0_UTC_CTRL); - writeb(devpriv->utcCtrl[3], devpriv->las0 + LAS0_UTC_CTRL); + writeb((0 << 6) | 0x30, devpriv->las0 + LAS0_UTC_CTRL); + writeb((1 << 6) | 0x30, devpriv->las0 + LAS0_UTC_CTRL); + writeb((2 << 6) | 0x30, devpriv->las0 + LAS0_UTC_CTRL); + writeb((3 << 6) | 0x00, devpriv->las0 + LAS0_UTC_CTRL); /* TODO: set user out source ??? */ } |