linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Johannes Thumshirn <morbidrsa@gmail.com>,
	Doug Thompson <dougthompson@xmission.com>,
	Borislav Petkov <bp@alien8.de>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH] EDAC, mpc85xx: fix build warning
Date: Tue,  2 Feb 2016 13:30:21 +0530	[thread overview]
Message-ID: <1454400021-17583-1-git-send-email-sudipm.mukherjee@gmail.com> (raw)

We were getting build warning about:
drivers/edac/mpc85xx_edac.c:1247:6: warning: unused variable 'pvr'

pvr is only used if CONFIG_FSL_SOC_BOOKE was defined. Declare the
variable as a local variable inside the #ifdef block.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/edac/mpc85xx_edac.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index b7139c1..951be71 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -1244,7 +1244,6 @@ static struct platform_driver * const drivers[] = {
 static int __init mpc85xx_mc_init(void)
 {
 	int res = 0;
-	u32 pvr = 0;
 
 	printk(KERN_INFO "Freescale(R) MPC85xx EDAC driver, "
 	       "(C) 2006 Montavista Software\n");
@@ -1264,16 +1263,18 @@ static int __init mpc85xx_mc_init(void)
 		printk(KERN_WARNING EDAC_MOD_STR "drivers fail to register\n");
 
 #ifdef CONFIG_FSL_SOC_BOOKE
-	pvr = mfspr(SPRN_PVR);
-
-	if ((PVR_VER(pvr) == PVR_VER_E500V1) ||
-	    (PVR_VER(pvr) == PVR_VER_E500V2)) {
-		/*
-		 * need to clear HID1[RFXE] to disable machine check int
-		 * so we can catch it
-		 */
-		if (edac_op_state == EDAC_OPSTATE_INT)
-			on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);
+	{
+		u32 pvr = mfspr(SPRN_PVR);
+
+		if ((PVR_VER(pvr) == PVR_VER_E500V1) ||
+		    (PVR_VER(pvr) == PVR_VER_E500V2)) {
+			/*
+			 * need to clear HID1[RFXE] to disable machine check int
+			 * so we can catch it
+			 */
+			if (edac_op_state == EDAC_OPSTATE_INT)
+				on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);
+		}
 	}
 #endif
 
-- 
1.9.1

             reply	other threads:[~2016-02-02  8:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-02  8:00 Sudip Mukherjee [this message]
2016-02-02 11:15 ` [PATCH] EDAC, mpc85xx: fix build warning Borislav Petkov
2016-02-02 14:38   ` Guenter Roeck
2016-02-02 14:48     ` Johannes Thumshirn
2016-02-02 14:55       ` Sudip Mukherjee
2016-02-02 15:09         ` Borislav Petkov
2016-02-02 15:13           ` Sudip Mukherjee
2016-02-02 15:15             ` Borislav Petkov
2016-02-02 15:19               ` Sudip Mukherjee
2016-02-02 14:48   ` 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=1454400021-17583-1-git-send-email-sudipm.mukherjee@gmail.com \
    --to=sudipm.mukherjee@gmail.com \
    --cc=bp@alien8.de \
    --cc=dougthompson@xmission.com \
    --cc=linux-edac@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@osg.samsung.com \
    --cc=morbidrsa@gmail.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).