Commit d3bf2177 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: dt3000: remove empty 'else' code

There are a number of:

	} else {
		/* not supported */
	}

cases in this driver. Remove them.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f26d8b70
...@@ -488,9 +488,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, ...@@ -488,9 +488,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->scan_begin_arg = 100 * 16 * 65535; cmd->scan_begin_arg = 100 * 16 * 65535;
err++; err++;
} }
} else {
/* not supported */
} }
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg < this_board->ai_speed) { if (cmd->convert_arg < this_board->ai_speed) {
cmd->convert_arg = this_board->ai_speed; cmd->convert_arg = this_board->ai_speed;
...@@ -500,8 +499,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, ...@@ -500,8 +499,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->convert_arg = 50 * 16 * 65535; cmd->convert_arg = 50 * 16 * 65535;
err++; err++;
} }
} else {
/* not supported */
} }
if (cmd->scan_end_arg != cmd->chanlist_len) { if (cmd->scan_end_arg != cmd->chanlist_len) {
...@@ -532,9 +529,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, ...@@ -532,9 +529,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->flags & TRIG_ROUND_MASK); cmd->flags & TRIG_ROUND_MASK);
if (tmp != cmd->scan_begin_arg) if (tmp != cmd->scan_begin_arg)
err++; err++;
} else {
/* not supported */
} }
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg; tmp = cmd->convert_arg;
dt3k_ns_to_timer(50, &cmd->convert_arg, dt3k_ns_to_timer(50, &cmd->convert_arg,
...@@ -548,8 +544,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, ...@@ -548,8 +544,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->convert_arg * cmd->scan_end_arg; cmd->convert_arg * cmd->scan_end_arg;
err++; err++;
} }
} else {
/* not supported */
} }
if (err) if (err)
...@@ -585,8 +579,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -585,8 +579,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
cmd->flags & TRIG_ROUND_MASK); cmd->flags & TRIG_ROUND_MASK);
writew((divider >> 16), devpriv->io_addr + DPR_Params(1)); writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2)); writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
} else {
/* not supported */
} }
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
...@@ -594,8 +586,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -594,8 +586,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
cmd->flags & TRIG_ROUND_MASK); cmd->flags & TRIG_ROUND_MASK);
writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3)); writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4)); writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
} else {
/* not supported */
} }
mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0; mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment