OSDN Git Service

staging: comedi: amplc_dio200_common: remove unnecessary 'counter_number' checks
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 23 Feb 2015 21:57:59 +0000 (14:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Mar 2015 02:51:52 +0000 (18:51 -0800)
The 'counter_number' in these functions is the comedi channel number from the
chanspec. The comedi core validates the chanspec before calling the driver
functions. Remove the unnecessary checks.

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/amplc_dio200_common.c

index 6ef70a5..48cdddc 100644 (file)
@@ -577,8 +577,6 @@ static int dio200_subdev_8254_set_gate_src(struct comedi_device *dev,
 
        if (!board->has_clk_gat_sce)
                return -1;
-       if (counter_number > 2)
-               return -1;
        if (gate_src > (board->is_pcie ? 31 : 7))
                return -1;
 
@@ -598,8 +596,6 @@ static int dio200_subdev_8254_get_gate_src(struct comedi_device *dev,
 
        if (!board->has_clk_gat_sce)
                return -1;
-       if (counter_number > 2)
-               return -1;
 
        return subpriv->gate_src[counter_number];
 }
@@ -615,8 +611,6 @@ static int dio200_subdev_8254_set_clock_src(struct comedi_device *dev,
 
        if (!board->has_clk_gat_sce)
                return -1;
-       if (counter_number > 2)
-               return -1;
        if (clock_src > (board->is_pcie ? 31 : 7))
                return -1;
 
@@ -638,8 +632,6 @@ static int dio200_subdev_8254_get_clock_src(struct comedi_device *dev,
 
        if (!board->has_clk_gat_sce)
                return -1;
-       if (counter_number > 2)
-               return -1;
 
        clock_src = subpriv->clock_src[counter_number];
        *period_ns = clock_period[clock_src];