staging: comedi: amplc_dio200_common: remove 'which' from struct dio200_subdev_8254

This member is only used in the "set gate" and "set clock" helper functions. Remove
it and calculate the value when needed.

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>

diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c
index 2c9c8dd612d80f0055bc2373a20bad551c62b1ae..6ef70a58c7b80e2eb1cef2be4f7f76a53a3a6040 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200_common.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c
@@ -99,7 +99,6 @@ static const unsigned int ts_clock_period[TS_CONFIG_MAX_CLK_SRC + 1] = {
 
 struct dio200_subdev_8254 {
        unsigned int ofs;               /* Counter base offset */
-       int which;                      /* Bit 5 of CLK_SCE or GAT_SCE */
        unsigned int clock_src[3];      /* Current clock sources */
        unsigned int gate_src[3];       /* Current gate sources */
        spinlock_t spinlock;
@@ -584,7 +583,7 @@ static int dio200_subdev_8254_set_gate_src(struct comedi_device *dev,
                return -1;
 
        subpriv->gate_src[counter_number] = gate_src;
-       byte = gat_sce(subpriv->which, counter_number, gate_src);
+       byte = gat_sce((subpriv->ofs >> 2) & 1, counter_number, gate_src);
        dio200_write8(dev, DIO200_GAT_SCE(subpriv->ofs >> 3), byte);
 
        return 0;
@@ -622,7 +621,7 @@ static int dio200_subdev_8254_set_clock_src(struct comedi_device *dev,
                return -1;
 
        subpriv->clock_src[counter_number] = clock_src;
-       byte = clk_sce(subpriv->which, counter_number, clock_src);
+       byte = clk_sce((subpriv->ofs >> 2) & 1, counter_number, clock_src);
        dio200_write8(dev, DIO200_CLK_SCE(subpriv->ofs >> 3), byte);
 
        return 0;
@@ -724,8 +723,6 @@ static int dio200_subdev_8254_init(struct comedi_device *dev,
 
        spin_lock_init(&subpriv->spinlock);
        subpriv->ofs = offset;
-       if (board->has_clk_gat_sce)
-               subpriv->which = (offset >> 2) & 1;
 
        /* Initialize channels. */
        for (chan = 0; chan < 3; chan++) {