From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Jarod Wilson <jarod@wilsonet.com>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
devel@driverdev.osuosl.org,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH 4/5] staging: media: lirc: place operator on previous line
Date: Fri, 18 Dec 2015 18:35:28 +0530 [thread overview]
Message-ID: <1450443929-15305-4-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1450443929-15305-1-git-send-email-sudipm.mukherjee@gmail.com>
checkpatch complains about the logical operator, which should be on the
previous line.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/staging/media/lirc/lirc_parallel.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index e09894d..0156114 100644
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -157,9 +157,9 @@ static unsigned int init_lirc_timer(void)
count++;
level = newlevel;
do_gettimeofday(&now);
- } while (count < 1000 && (now.tv_sec < tv.tv_sec
- || (now.tv_sec == tv.tv_sec
- && now.tv_usec < tv.tv_usec)));
+ } while (count < 1000 && (now.tv_sec < tv.tv_sec ||
+ (now.tv_sec == tv.tv_sec &&
+ now.tv_usec < tv.tv_usec)));
timeelapsed = (now.tv_sec + 1 - tv.tv_sec) * 1000000
+ (now.tv_usec - tv.tv_usec);
@@ -279,8 +279,8 @@ static void lirc_lirc_irq_handler(void *blah)
level = newlevel;
/* giving up */
- if (signal > timeout
- || (check_pselecd && (in(1) & LP_PSELECD))) {
+ if (signal > timeout ||
+ (check_pselecd && (in(1) & LP_PSELECD))) {
signal = 0;
pr_notice("timeout\n");
break;
--
1.9.1
next prev parent reply other threads:[~2015-12-18 13:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 13:05 [PATCH 1/5] staging: media: lirc: replace NULL comparisons with !var Sudip Mukherjee
2015-12-18 13:05 ` [PATCH 2/5] staging: media: lirc: no space after cast Sudip Mukherjee
2015-12-18 13:05 ` [PATCH 3/5] staging: media: lirc: space around operator Sudip Mukherjee
2015-12-18 13:05 ` Sudip Mukherjee [this message]
2016-01-25 16:26 ` [PATCH 4/5] staging: media: lirc: place operator on previous line Mauro Carvalho Chehab
2015-12-18 13:05 ` [PATCH 5/5] staging: media: lirc: use new parport device model Sudip Mukherjee
2016-01-25 16:29 ` Mauro Carvalho Chehab
2016-01-25 17:02 ` Sudip Mukherjee
2016-01-25 17:12 ` Mauro Carvalho Chehab
2016-01-25 17:33 ` Sudip Mukherjee
2016-01-25 17:40 ` Mauro Carvalho Chehab
2016-03-03 11:49 ` Sudip Mukherjee
2016-05-25 11:54 ` Sudip Mukherjee
2015-12-30 4:28 ` [PATCH 1/5] staging: media: lirc: replace NULL comparisons with !var Sudip Mukherjee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450443929-15305-4-git-send-email-sudipm.mukherjee@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jarod@wilsonet.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).