summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lakeev <sunnyddayss@gmail.com>2017-12-13 20:39:53 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-19 15:10:09 +0100
commite9f14f1954ef73ef17b90651d653c67cd79715be (patch)
treefed78df953b93df0ee3f4a73e1f0cc4ea876c55e
parent07df5b7c94c266481e341031a6a8293345a0a87c (diff)
downloadlinux-stable-e9f14f1954ef73ef17b90651d653c67cd79715be.tar.gz
linux-stable-e9f14f1954ef73ef17b90651d653c67cd79715be.tar.bz2
linux-stable-e9f14f1954ef73ef17b90651d653c67cd79715be.zip
staging: comedi: s626.c - fix multiline dereference
staging: comedi: s626.c - fix the following checkpatch issues: WARNING: Avoid multiple line dereference - prefer 'devpriv->rps_buf.logical_base' #1380: FILE: drivers/s626.c:1380: + (unsigned long)devpriv-> + rps_buf.logical_base); WARNING: Avoid multiple line dereference - prefer 'cmd->scan_begin_arg' #1898: FILE: drivers/s626.c:1898: + err |= comedi_check_trigger_arg_min(&cmd-> + scan_begin_arg, Signed-off-by: Roman Lakeev <sunnyddayss@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/s626.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 8d9187025d51..0b3cfe934e14 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -1376,8 +1376,7 @@ static void s626_reset_adc(struct comedi_device *dev, u8 *ppl)
jmp_adrs =
(u32)devpriv->rps_buf.physical_base +
(u32)((unsigned long)rps -
- (unsigned long)devpriv->
- rps_buf.logical_base);
+ (unsigned long)devpriv->rps_buf.logical_base);
for (i = 0; i < (10 * S626_RPSCLK_PER_US / 2); i++) {
jmp_adrs += 8; /* Repeat to implement time delay: */
/* Jump to next RPS instruction. */
@@ -1894,9 +1893,9 @@ static int s626_ai_cmdtest(struct comedi_device *dev,
if (cmd->scan_begin_src == TRIG_TIMER) {
arg = cmd->convert_arg * cmd->scan_end_arg;
- err |= comedi_check_trigger_arg_min(&cmd->
- scan_begin_arg,
- arg);
+ err |= comedi_check_trigger_arg_min(
+ &cmd->scan_begin_arg,
+ arg);
}
}