From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbdAVNvl (ORCPT ); Sun, 22 Jan 2017 08:51:41 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:44927 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099AbdAVNvd (ORCPT ); Sun, 22 Jan 2017 08:51:33 -0500 From: Nicolas Iooss To: Mauro Carvalho Chehab , Borislav Petkov , linux-edac@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nicolas Iooss Subject: [PATCH 1/1] EDAC: always return an initialized value in knl_show_interleave_mode Date: Sun, 22 Jan 2017 14:51:15 +0100 Message-Id: <20170122135115.13256-1-nicolas.iooss_linux@m4x.org> X-Mailer: git-send-email 2.11.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Jan 22 14:51:31 2017 +0100 (CET)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000024, queueID=B241C5646BC Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building drivers/edac/sb_edac.c with compiler warning flags which aim to detect the use of uninitialized values at compile time, the compiler reports that knl_show_interleave_mode() may return an uninitialized value. This function indeed uses a switch statement to set a local variable ("s"), which is not set to anything in the default statement. Anyway this would be never reached as knl_interleave_mode(reg) always returns a value between 0 and 3, but the compiler has no way of knowing this. Silent the compiler warning by initializing variable "s" too in the default case. While at it, make knl_show_interleave_mode() and show_interleave_mode() return const char* values as the returned pointers refer to read-only memory. Signed-off-by: Nicolas Iooss --- drivers/edac/sb_edac.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 54ae6dc45ab2..15a068744c25 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -304,7 +304,7 @@ struct sbridge_info { u64 (*rir_limit)(u32 reg); u64 (*sad_limit)(u32 reg); u32 (*interleave_mode)(u32 reg); - char* (*show_interleave_mode)(u32 reg); + const char* (*show_interleave_mode)(u32 reg); u32 (*dram_attr)(u32 reg); const u32 *dram_rule; const u32 *interleave_list; @@ -811,7 +811,7 @@ static u32 interleave_mode(u32 reg) return GET_BITFIELD(reg, 1, 1); } -char *show_interleave_mode(u32 reg) +static const char *show_interleave_mode(u32 reg) { return interleave_mode(reg) ? "8:6" : "[8:6]XOR[18:16]"; } @@ -831,9 +831,9 @@ static u32 knl_interleave_mode(u32 reg) return GET_BITFIELD(reg, 1, 2); } -static char *knl_show_interleave_mode(u32 reg) +static const char *knl_show_interleave_mode(u32 reg) { - char *s; + const char *s; switch (knl_interleave_mode(reg)) { case 0: @@ -850,6 +850,7 @@ static char *knl_show_interleave_mode(u32 reg) break; default: WARN_ON(1); + s = ""; break; } -- 2.11.0