From e9f14f1954ef73ef17b90651d653c67cd79715be Mon Sep 17 00:00:00 2001
From: Roman Lakeev <sunnyddayss@gmail.com>
Date: Wed, 13 Dec 2017 20:39:53 -0800
Subject: [PATCH] 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>
---
drivers/staging/comedi/drivers/s626.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 8d9187025d515..0b3cfe934e14a 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);
}
}