linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shraddha Barke <shraddha.6596@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Oleg Drokin <oleg.drokin@intel.com>,
	linux-kernel@vger.kernel.org, Greg Donald <gdonald@gmail.com>,
	Joe Perches <joe@perches.com>
Cc: Shraddha Barke <shraddha.6596@gmail.com>
Subject: [PATCH 03/10] Staging: lustre: libcfs: Remove braces for single statement blocks
Date: Sat,  5 Sep 2015 18:58:21 +0530	[thread overview]
Message-ID: <1441459708-2633-3-git-send-email-shraddha.6596@gmail.com> (raw)
In-Reply-To: <1441459708-2633-1-git-send-email-shraddha.6596@gmail.com>

The linux kernel coding style discourages use of braces for single
statement blocks. This patch removes the unnecessary braces.

The warning was detected using checkpatch.pl. Coccinelle was used to
make the change.

Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
index fbbc8a7..328a278 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
@@ -71,13 +71,12 @@ static int cfs_crypto_hash_alloc(unsigned char alg_id,
 	 * Skip this function for digest, because we use shash logic at
 	 * cfs_crypto_hash_alloc.
 	 */
-	if (key != NULL) {
+	if (key != NULL)
 		err = crypto_hash_setkey(desc->tfm, key, key_len);
-	} else if ((*type)->cht_key != 0) {
+	else if ((*type)->cht_key != 0)
 		err = crypto_hash_setkey(desc->tfm,
 					 (unsigned char *)&((*type)->cht_key),
 					 (*type)->cht_size);
-	}
 
 	if (err != 0) {
 		crypto_free_hash(desc->tfm);
-- 
2.1.4


  parent reply	other threads:[~2015-09-05 13:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-05 13:28 [PATCH 01/10] Staging: rtl8723au: hal: Remove braces for single statement blocks Shraddha Barke
2015-09-05 13:28 ` [PATCH 02/10] Staging: lustre: ptlrpc: " Shraddha Barke
2015-09-05 13:28 ` Shraddha Barke [this message]
2015-09-05 13:28 ` [PATCH 04/10] Staging: lustre: obdclass: " Shraddha Barke
2015-09-05 13:28 ` [PATCH 05/10] Staging: lustre: llite: llite_close.c: Remove unnecessary braces Shraddha Barke
2015-09-05 13:28 ` [PATCH 06/10] Staging: lustre: llite: llite_lib.c: " Shraddha Barke
2015-09-05 13:28 ` [PATCH 07/10] Staging: lustre: lnet: Remove braces for single statement blocks Shraddha Barke
2015-09-05 13:28 ` [PATCH 08/10] Staging: android: Remove unnecessary braces Shraddha Barke
2015-09-05 13:28 ` [PATCH 09/10] Staging: speakup: Remove braces for single statement blocks Shraddha Barke
2015-09-05 13:28 ` [PATCH 10/10] Staging: rtl8192e: rtl_wx.c: " Shraddha Barke

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=1441459708-2633-3-git-send-email-shraddha.6596@gmail.com \
    --to=shraddha.6596@gmail.com \
    --cc=gdonald@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg.drokin@intel.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).