Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1323872

[PATCH] EDAC, mpc85xx: fix build warning

Show all headers | View 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] EDAC, mpc85xx: fix build warning Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-02-02 09:10 +0100
  Re: [PATCH] EDAC, mpc85xx: fix build warning Borislav Petkov <bp@alien8.de> - 2016-02-02 12:20 +0100
    Re: [PATCH] EDAC, mpc85xx: fix build warning Guenter Roeck <linux@roeck-us.net> - 2016-02-02 15:40 +0100
      Re: [PATCH] EDAC, mpc85xx: fix build warning Johannes Thumshirn <jthumshirn@suse.de> - 2016-02-02 15:50 +0100
        Re: [PATCH] EDAC, mpc85xx: fix build warning Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-02-02 16:00 +0100
          Re: [PATCH] EDAC, mpc85xx: fix build warning Borislav Petkov <bp@alien8.de> - 2016-02-02 16:10 +0100
            Re: [PATCH] EDAC, mpc85xx: fix build warning Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-02-02 16:20 +0100
              Re: [PATCH] EDAC, mpc85xx: fix build warning Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-02-02 16:20 +0100
              Re: [PATCH] EDAC, mpc85xx: fix build warning Borislav Petkov <bp@alien8.de> - 2016-02-02 16:20 +0100
    Re: [PATCH] EDAC, mpc85xx: fix build warning Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-02-02 15:50 +0100

csiph-web