Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03ac6b34 authored by Valentin Rothberg's avatar Valentin Rothberg Committed by Greg Kroah-Hartman
Browse files

drivers/tty/nozomi.c: rename CONFIG_MAGIC 



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: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 360ee94b

drivers/tty/nozomi.c

+4 −4
Original line number Diff line number Diff line
@@ -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 NOZOMI_CONFIG_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 != 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;

	}