All of lore.kernel.org
 help / color / mirror / Atom feed
From: simran singhal <singhalsimran0@gmail.com>
To: gregkh@linuxfoundation.org
Cc: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org,
	outreachy-kernel@googlegroups.com
Subject: [PATCH 1/5] staging: lustre: Remove unnecessary else after return
Date: Mon, 27 Feb 2017 23:44:24 +0530	[thread overview]
Message-ID: <1488219268-3006-1-git-send-email-singhalsimran0@gmail.com> (raw)

This patch fixes the checkpatch warning that else is not generally
useful after a break or return.

@@
expression e2;
statement s1;
@@
if(e2) { ... return ...; }
-else
         s1

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
---
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +--
 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index fbbd8a5..02d49b7 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr)
 
 	if (!count)
 		return -ENOENT;
-	else
-		return 0;
+	return 0;
 }
 
 void
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index cf3fc57..ac32c82 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl,
 
 	if (nr == 0)
 		return (unused / 100) * sysctl_vfs_cache_pressure;
-	else
-		return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK);
+	return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK);
 }
 
 static const struct ldlm_pool_ops ldlm_cli_pool_ops = {
-- 
2.7.4



WARNING: multiple messages have this Message-ID (diff)
From: simran singhal <singhalsimran0@gmail.com>
To: gregkh@linuxfoundation.org
Cc: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org,
	outreachy-kernel@googlegroups.com
Subject: [PATCH 1/5] staging: lustre: Remove unnecessary else after return
Date: Mon, 27 Feb 2017 18:26:24 +0000	[thread overview]
Message-ID: <1488219268-3006-1-git-send-email-singhalsimran0@gmail.com> (raw)

This patch fixes the checkpatch warning that else is not generally
useful after a break or return.

@@
expression e2;
statement s1;
@@
if(e2) { ... return ...; }
-else
         s1

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
---
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +--
 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index fbbd8a5..02d49b7 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr)
 
 	if (!count)
 		return -ENOENT;
-	else
-		return 0;
+	return 0;
 }
 
 void
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index cf3fc57..ac32c82 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl,
 
 	if (nr = 0)
 		return (unused / 100) * sysctl_vfs_cache_pressure;
-	else
-		return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK);
+	return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK);
 }
 
 static const struct ldlm_pool_ops ldlm_cli_pool_ops = {
-- 
2.7.4


             reply	other threads:[~2017-02-27 18:12 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-27 18:14 simran singhal [this message]
2017-02-27 18:26 ` [PATCH 1/5] staging: lustre: Remove unnecessary else after return simran singhal
2017-02-27 18:14 ` [PATCH 2/5] staging: rtl8192u: " simran singhal
2017-02-27 18:26   ` simran singhal
2017-02-27 21:25   ` [Outreachy kernel] " Julia Lawall
2017-02-27 21:25     ` [lustre-devel] " Julia Lawall
2017-02-27 21:25     ` Julia Lawall
2017-02-27 18:14 ` [PATCH 3/5] staging: rtl8712: " simran singhal
2017-02-27 18:26   ` simran singhal
2017-02-27 21:19   ` [Outreachy kernel] " Julia Lawall
2017-02-27 21:19     ` [lustre-devel] " Julia Lawall
2017-02-27 21:19     ` Julia Lawall
2017-02-28 19:17     ` SIMRAN SINGHAL
2017-02-28 19:29       ` SIMRAN SINGHAL
2017-02-28 19:19       ` Julia Lawall
2017-02-28 19:19         ` [lustre-devel] " Julia Lawall
2017-02-28 19:19         ` Julia Lawall
2017-02-27 18:14 ` [PATCH 4/5] staging: sm750fb: " simran singhal
2017-02-27 18:26   ` simran singhal
2017-02-27 19:31   ` Joe Perches
2017-02-27 19:31     ` [lustre-devel] " Joe Perches
2017-02-27 19:31     ` Joe Perches
2017-02-27 20:22     ` SIMRAN SINGHAL
2017-02-27 20:34       ` SIMRAN SINGHAL
2017-02-27 21:15   ` [Outreachy kernel] " Julia Lawall
2017-02-27 21:15     ` [lustre-devel] " Julia Lawall
2017-02-27 21:15     ` Julia Lawall
2017-02-28 18:56     ` SIMRAN SINGHAL
2017-02-28 19:08       ` SIMRAN SINGHAL
2017-02-28 19:00       ` Julia Lawall
2017-02-28 19:00         ` [lustre-devel] " Julia Lawall
2017-02-28 19:00         ` Julia Lawall
2017-02-28 19:05         ` SIMRAN SINGHAL
2017-02-28 19:17           ` SIMRAN SINGHAL
2017-02-27 18:14 ` [PATCH 5/5] staging: gdm724x: " simran singhal
2017-02-27 18:26   ` simran singhal
2017-02-27 19:41   ` Joe Perches
2017-02-27 19:41     ` [lustre-devel] " Joe Perches
2017-02-27 19:41     ` Joe Perches
2017-02-27 20:19     ` SIMRAN SINGHAL
2017-02-27 20:31       ` SIMRAN SINGHAL
2017-02-28 19:11       ` SIMRAN SINGHAL
2017-02-28 19:23         ` SIMRAN SINGHAL
2017-02-28 19:18         ` [Outreachy kernel] " Julia Lawall
2017-02-28 19:18           ` [lustre-devel] " Julia Lawall
2017-02-28 19:18           ` Julia Lawall
2017-02-28 19:18         ` Joe Perches
2017-02-28 19:18           ` [lustre-devel] " Joe Perches
2017-02-28 19:18           ` Joe Perches
2017-02-28 19:21           ` [Outreachy kernel] " Julia Lawall
2017-02-28 19:21             ` [lustre-devel] " Julia Lawall
2017-02-28 19:21             ` Julia Lawall
2017-02-27 19:25 ` [PATCH 1/5] staging: lustre: " Joe Perches
2017-02-27 19:25   ` [lustre-devel] " Joe Perches
2017-02-27 19:25   ` Joe Perches
2017-02-27 20:21   ` SIMRAN SINGHAL
2017-02-27 20:33     ` SIMRAN SINGHAL
2017-02-27 20:43     ` Joe Perches
2017-02-27 20:43       ` [lustre-devel] " Joe Perches
2017-02-27 20:43       ` Joe Perches
2017-02-28 19:01       ` SIMRAN SINGHAL
2017-02-28 19:13         ` SIMRAN SINGHAL
2017-02-28 19:14         ` [Outreachy kernel] " Julia Lawall
2017-02-28 19:14           ` [lustre-devel] " Julia Lawall
2017-02-28 19:14           ` Julia Lawall

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=1488219268-3006-1-git-send-email-singhalsimran0@gmail.com \
    --to=singhalsimran0@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lustre-devel@lists.lustre.org \
    --cc=outreachy-kernel@googlegroups.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.