Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031224AbbKEJjX (ORCPT ); Thu, 5 Nov 2015 04:39:23 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:37475 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756547AbbKEJjO (ORCPT ); Thu, 5 Nov 2015 04:39:14 -0500 From: LABBE Corentin To: arnd@arndb.de, gregkh@linuxfoundation.org Cc: LABBE Corentin , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] char/nvram: set array of const as const Date: Thu, 5 Nov 2015 10:39:00 +0100 Message-Id: <1446716341-18084-1-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1796 Lines: 71 Some array of const char are not set as const. This patch fix that. Signed-off-by: LABBE Corentin --- drivers/char/nvram.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 97c2d8d..cb901b3 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c @@ -508,12 +508,12 @@ static void pc_set_checksum(void) #ifdef CONFIG_PROC_FS -static char *floppy_types[] = { +static const char * const floppy_types[] = { "none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M", "3.5'' 2.88M", "3.5'' 2.88M" }; -static char *gfx_types[] = { +static const char * const gfx_types[] = { "EGA, VGA, ... (with BIOS)", "CGA (40 cols)", "CGA (80 cols)", @@ -614,7 +614,7 @@ static void atari_set_checksum(void) static struct { unsigned char val; - char *name; + const char *name; } boot_prefs[] = { { 0x80, "TOS" }, { 0x40, "ASV" }, @@ -623,7 +623,7 @@ static struct { { 0x00, "unspecified" } }; -static char *languages[] = { +static const char * const languages[] = { "English (US)", "German", "French", @@ -635,7 +635,7 @@ static char *languages[] = { "Swiss (German)" }; -static char *dateformat[] = { +static const char * const dateformat[] = { "MM%cDD%cYY", "DD%cMM%cYY", "YY%cMM%cDD", @@ -646,7 +646,7 @@ static char *dateformat[] = { "7 (undefined)" }; -static char *colors[] = { +static const char * const colors[] = { "2", "4", "16", "256", "65536", "??", "??", "??" }; -- 2.4.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/