mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: martin.petersen@oracle.com,
	James.Bottomley@HansenPartnership.com,
	Kashyap Desai <kashyap.desai@avagotech.com>,
	Sumit Saxena <sumit.saxena@avagotech.com>,
	Uday Lingala <uday.lingala@avagotech.com>,
	"James E.J. Bottomley" <JBottomley@odin.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>, Tomas Henzl <thenzl@redhat.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	megaraidlinux.pdl@avagotech.com
Subject: [PATCH 3/3] megaraid_sas: add missing curly braces in ioctl handler
Date: Mon, 14 Mar 2016 15:29:45 +0100	[thread overview]
Message-ID: <1457965789-3373916-4-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1457965789-3373916-1-git-send-email-arnd@arndb.de>

gcc-6 found a dubious indentation in the megasas_mgmt_fw_ioctl
function:

drivers/scsi/megaraid/megaraid_sas_base.c: In function 'megasas_mgmt_fw_ioctl':
drivers/scsi/megaraid/megaraid_sas_base.c:6658:4: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
    kbuff_arr[i] = NULL;
    ^~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:6653:3: note: ...this 'if' clause, but it is not
   if (kbuff_arr[i])
   ^~

The code is actually correct, as there is no downside in clearing a NULL
pointer again.

This clarifies the code and avoids the warning by adding extra curly
braces.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 90dc9d98f01b ("megaraid_sas : MFI MPT linked list corruption fix")
---
 drivers/scsi/megaraid/megaraid_sas_base.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 5c08568ccfbf..2627200d4f82 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -6650,12 +6650,13 @@ out:
 	}
 
 	for (i = 0; i < ioc->sge_count; i++) {
-		if (kbuff_arr[i])
+		if (kbuff_arr[i]) {
 			dma_free_coherent(&instance->pdev->dev,
 					  le32_to_cpu(kern_sge32[i].length),
 					  kbuff_arr[i],
 					  le32_to_cpu(kern_sge32[i].phys_addr));
 			kbuff_arr[i] = NULL;
+		}
 	}
 
 	megasas_return_cmd(instance, cmd);
-- 
2.7.0

  parent reply	other threads:[~2016-03-14 14:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-14 14:29 gcc-6.0 warnings for scsi Arnd Bergmann
2016-03-14 14:29 ` [PATCH 1/3] aacraid: add missing curly braces Arnd Bergmann
2016-03-18 19:20   ` Martin K. Petersen
2016-03-18 20:50   ` Raghava Aditya Renukunta
2016-03-22  0:26   ` Martin K. Petersen
2016-03-14 14:29 ` [PATCH 2/3] lpfc: fix misleading indentation Arnd Bergmann
2016-03-14 15:19   ` Hannes Reinecke
2016-03-14 15:25     ` Arnd Bergmann
2016-03-14 15:26       ` Hannes Reinecke
2016-03-14 15:48         ` Ewan Milne
2016-03-14 22:27   ` Sebastian Herbszt
2016-03-18 19:22   ` Martin K. Petersen
2016-03-14 14:29 ` Arnd Bergmann [this message]
2016-03-14 15:20   ` [PATCH 3/3] megaraid_sas: add missing curly braces in ioctl handler Hannes Reinecke
2016-03-15 11:08   ` Sumit Saxena
2016-03-18 19:23   ` Martin K. Petersen

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=1457965789-3373916-4-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=JBottomley@odin.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bhelgaas@google.com \
    --cc=kashyap.desai@avagotech.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=megaraidlinux.pdl@avagotech.com \
    --cc=sumit.saxena@avagotech.com \
    --cc=thenzl@redhat.com \
    --cc=uday.lingala@avagotech.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

all inboxes | Powered by JetHome®