]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: rtd520: remove utcCtrl from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 26 Mar 2013 22:01:39 +0000 (15:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Mar 2013 23:16:22 +0000 (16:16 -0700)
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>
drivers/staging/comedi/drivers/rtd520.c

index 5d7e385b3807d3685fa0a3d1c1ced356ccaa5944..7183355d12cafab19964e71ae2d40fdc7804430c 100644 (file)
@@ -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 ??? */
 }