From ed023d529ce44c0e3c41101a344d80259bd96443 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 23 Feb 2015 14:57:59 -0700 Subject: [PATCH] staging: comedi: amplc_dio200_common: remove unnecessary 'counter_number' checks 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/amplc_dio200_common.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c index 6ef70a58c7b8..48cdddc56110 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200_common.c +++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c @@ -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]; -- 2.30.2