Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751598AbbDLO4L (ORCPT ); Sun, 12 Apr 2015 10:56:11 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35566 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431AbbDLO4J (ORCPT ); Sun, 12 Apr 2015 10:56:09 -0400 From: Valentin Rothberg To: gregkh@linuxfoundation.org, jslaby@suse.cz, linux-kernel@vger.kernel.org Cc: Valentin Rothberg Subject: [PATCH] drivers/tty/nozomi.c: rename CONFIG_MAGIC Date: Sun, 12 Apr 2015 16:56:01 +0200 Message-Id: <1428850561-4311-1-git-send-email-valentinrothberg@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1517 Lines: 44 The CONFIG_ prefix is reserved for Kconfig options in Make and CPP syntax. CONFIG_MAGIC is a file local CPP identifier so strip the prefix to apply to Kconfig's naming convention. Signed-off-by: Valentin Rothberg --- I found this issue with ./scripts/checkkconfigsymbols.py --- drivers/tty/nozomi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index 74885af8c7bd..4a4775e81963 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -140,7 +140,7 @@ static int debug; #define R_FCR 0x0000 /* Flow Control Register */ #define R_IER 0x0004 /* Interrupt Enable Register */ -#define CONFIG_MAGIC 0xEFEFFEFE +#define MAGIC 0xEFEFFEFE #define TOGGLE_VALID 0x0000 /* Definition of interrupt tokens */ @@ -660,9 +660,9 @@ static int nozomi_read_config_table(struct nozomi *dc) read_mem32((u32 *) &dc->config_table, dc->base_addr + 0, sizeof(struct config_table)); - if (dc->config_table.signature != CONFIG_MAGIC) { + if (dc->config_table.signature != MAGIC) { dev_err(&dc->pdev->dev, "ConfigTable Bad! 0x%08X != 0x%08X\n", - dc->config_table.signature, CONFIG_MAGIC); + dc->config_table.signature, MAGIC); return 0; } -- 2.1.0 -- 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/