]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: ni_mio_common: remove BUG() check in ni_cdio_cmd()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 1 May 2015 21:58:49 +0000 (14:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 May 2015 17:05:06 +0000 (19:05 +0200)
The cmd->scan_begin_src was validated in ni_cdio_cmdtest() and can only
be TRIG_EXT. Remove the switch statement and unnecessary BUG() check.

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

index acba13847c2992faae104936c0b8a08c9e300bb2..cbfbfa5ab7525f773c6be5750adcf33365333fca 100644 (file)
@@ -3460,16 +3460,8 @@ static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        int retval;
 
        ni_writel(dev, NI_M_CDO_CMD_RESET, NI_M_CDIO_CMD_REG);
-       switch (cmd->scan_begin_src) {
-       case TRIG_EXT:
-               cdo_mode_bits |=
-                   CR_CHAN(cmd->scan_begin_arg) &
-                   CDO_Sample_Source_Select_Mask;
-               break;
-       default:
-               BUG();
-               break;
-       }
+       cdo_mode_bits |= CR_CHAN(cmd->scan_begin_arg) &
+                        CDO_Sample_Source_Select_Mask;
        if (cmd->scan_begin_arg & CR_INVERT)
                cdo_mode_bits |= CDO_Polarity_Bit;
        ni_writel(dev, cdo_mode_bits, NI_M_CDO_MODE_REG);