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

staging: comedi: s626: remove unnecessary 'cmd' pointer checks

The local variable 'cmd' is a pointer to the address of a member variable
of a struct. It will always be valid. Remove the unnecessary checks.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c36fdde
...@@ -1576,7 +1576,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl) ...@@ -1576,7 +1576,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
dev->mmio + S626_P_RPSADDR1); dev->mmio + S626_P_RPSADDR1);
/* Construct RPS program in rps_buf DMA buffer */ /* Construct RPS program in rps_buf DMA buffer */
if (cmd != NULL && cmd->scan_begin_src != TRIG_FOLLOW) { if (cmd->scan_begin_src != TRIG_FOLLOW) {
/* Wait for Start trigger. */ /* Wait for Start trigger. */
*rps++ = S626_RPS_PAUSE | S626_RPS_SIGADC; *rps++ = S626_RPS_PAUSE | S626_RPS_SIGADC;
*rps++ = S626_RPS_CLRSIGNAL | S626_RPS_SIGADC; *rps++ = S626_RPS_CLRSIGNAL | S626_RPS_SIGADC;
...@@ -1665,7 +1665,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl) ...@@ -1665,7 +1665,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
*rps++ = jmp_adrs; *rps++ = jmp_adrs;
} }
if (cmd != NULL && cmd->convert_src != TRIG_NOW) { if (cmd->convert_src != TRIG_NOW) {
/* Wait for Start trigger. */ /* Wait for Start trigger. */
*rps++ = S626_RPS_PAUSE | S626_RPS_SIGADC; *rps++ = S626_RPS_PAUSE | S626_RPS_SIGADC;
*rps++ = S626_RPS_CLRSIGNAL | S626_RPS_SIGADC; *rps++ = S626_RPS_CLRSIGNAL | S626_RPS_SIGADC;
...@@ -2034,10 +2034,6 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -2034,10 +2034,6 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* reset ai_cmd_running flag */ /* reset ai_cmd_running flag */
devpriv->ai_cmd_running = 0; devpriv->ai_cmd_running = 0;
/* test if cmd is valid */
if (cmd == NULL)
return -EINVAL;
s626_ai_load_polllist(ppl, cmd); s626_ai_load_polllist(ppl, cmd);
devpriv->ai_cmd_running = 1; devpriv->ai_cmd_running = 1;
devpriv->ai_convert_count = 0; devpriv->ai_convert_count = 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