mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] drivers/tty/nozomi.c: rename CONFIG_MAGIC
@ 2015-04-12 16:35 Valentin Rothberg
  0 siblings, 0 replies; only message in thread
From: Valentin Rothberg @ 2015-04-12 16:35 UTC (permalink / raw)
  To: gregkh, jslaby, linux-kernel, peter; +Cc: Valentin Rothberg

The CONFIG_ prefix is reserved for Kconfig options in Make and CPP
syntax.  CONFIG_MAGIC is a file local CPP identifier so change the
prefix to apply to Kconfig's naming convention.

Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
---
v2: MAGIC -> NOZOMI_CONFIG_MAGIC (suggested by Peter Hurley)
---
 drivers/tty/nozomi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 74885af8c7bd..80f9de907563 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -140,8 +140,8 @@ static int debug;
 #define R_FCR		0x0000	/* Flow Control Register */
 #define R_IER		0x0004	/* Interrupt Enable Register */
 
-#define CONFIG_MAGIC	0xEFEFFEFE
-#define TOGGLE_VALID	0x0000
+#define NOZOMI_CONFIG_MAGIC	0xEFEFFEFE
+#define TOGGLE_VALID		0x0000
 
 /* Definition of interrupt tokens */
 #define MDM_DL1		0x0001
@@ -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 != NOZOMI_CONFIG_MAGIC) {
 		dev_err(&dc->pdev->dev, "ConfigTable Bad! 0x%08X != 0x%08X\n",
-			dc->config_table.signature, CONFIG_MAGIC);
+			dc->config_table.signature, NOZOMI_CONFIG_MAGIC);
 		return 0;
 	}
 
-- 
2.1.0


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-12 16:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-12 16:35 [PATCH v2] drivers/tty/nozomi.c: rename CONFIG_MAGIC Valentin Rothberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®