From 05db892da4dfc51df00fbbb12b6fb64c9da4c1a6 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Thu, 6 Sep 2018 10:06:07 +0900 Subject: [PATCH] misc: modem_if: remove duplicated const declaration specifier Remove duplicated const declaration specifier to remove build warning with gcc7. Change-Id: I8c2e45946685b4fe465951e66b075e7cb18a1fef Signed-off-by: Seung-Woo Kim --- drivers/misc/modem_if/modem_prj.h | 6 +++--- drivers/misc/modem_if/modem_utils.h | 8 ++++---- drivers/misc/modem_v1/modem_prj.h | 2 +- drivers/misc/modem_v1/modem_utils.h | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/misc/modem_if/modem_prj.h b/drivers/misc/modem_if/modem_prj.h index 5e8d4725453..f9e1d7ec834 100644 --- a/drivers/misc/modem_if/modem_prj.h +++ b/drivers/misc/modem_if/modem_prj.h @@ -141,7 +141,7 @@ #define NO_WAKEUP_LOCK #define FREQ_MAX_LV (40) -static const char const *dev_format_str[] = { +static const char *dev_format_str[] = { [IPC_FMT] = "FMT", [IPC_RAW] = "RAW", [IPC_RFS] = "RFS", @@ -182,7 +182,7 @@ enum modem_state { #endif }; -static const char const *cp_state_str[] = { +static const char *cp_state_str[] = { [STATE_OFFLINE] = "OFFLINE", [STATE_CRASH_RESET] = "CRASH_RESET", [STATE_CRASH_EXIT] = "CRASH_EXIT", @@ -465,7 +465,7 @@ enum iod_rx_state { MAX_IOD_RX_STATE }; -static const char const *rx_state_str[] = { +static const char *rx_state_str[] = { [IOD_RX_ON_STANDBY] = "RX_ON_STANDBY", [IOD_RX_HEADER] = "RX_HEADER", [IOD_RX_PAYLOAD] = "RX_PAYLOAD", diff --git a/drivers/misc/modem_if/modem_utils.h b/drivers/misc/modem_if/modem_utils.h index 23b32719ac5..82dbc5f94ae 100644 --- a/drivers/misc/modem_if/modem_utils.h +++ b/drivers/misc/modem_if/modem_utils.h @@ -128,7 +128,7 @@ static inline int ns2ms(long ns) return (ns > 0) ? (ns / 1000000) : 0; } -static const char const *exynos_layer_string[] = { +static const char *exynos_layer_string[] = { [LINK] = "LNK", [IODEV] = "IOD", [APP] = "APP", @@ -156,7 +156,7 @@ static inline enum direction direction_opposite(enum direction dir) return (dir == TX) ? RX : TX; } -static const char const *direction_string[] = { +static const char *direction_string[] = { [TX] = "TX", [RX] = "RX" }; @@ -169,7 +169,7 @@ static const inline char *dir_str(enum direction dir) return direction_string[dir]; } -static const char const *ipc_direction_string[] = { +static const char *ipc_direction_string[] = { [TX] = "AP->CP", [RX] = "AP<-CP" }; @@ -182,7 +182,7 @@ static const inline char *ipc_dir(enum direction dir) return ipc_direction_string[dir]; } -static const char const *arrow_direction[] = { +static const char *arrow_direction[] = { [TX] = "->", [RX] = "<-" }; diff --git a/drivers/misc/modem_v1/modem_prj.h b/drivers/misc/modem_v1/modem_prj.h index 2f3446e1da7..54fb575b983 100644 --- a/drivers/misc/modem_v1/modem_prj.h +++ b/drivers/misc/modem_v1/modem_prj.h @@ -275,7 +275,7 @@ enum iod_rx_state { MAX_IOD_RX_STATE }; -static const char const *rx_state_string[] = { +static const char *rx_state_string[] = { [IOD_RX_ON_STANDBY] = "RX_ON_STANDBY", [IOD_RX_HEADER] = "RX_HEADER", [IOD_RX_PAYLOAD] = "RX_PAYLOAD", diff --git a/drivers/misc/modem_v1/modem_utils.h b/drivers/misc/modem_v1/modem_utils.h index 882875c4ed7..2432a7b85dd 100644 --- a/drivers/misc/modem_v1/modem_utils.h +++ b/drivers/misc/modem_v1/modem_utils.h @@ -108,7 +108,7 @@ enum ipc_layer { MAX_SIPC_LAYER }; -static const char const *sipc_layer_string[] = { +static const char *sipc_layer_string[] = { [LINK] = "LNK", [IODEV] = "IOD", [APP] = "APP", @@ -123,7 +123,7 @@ static const inline char *layer_str(enum ipc_layer layer) return sipc_layer_string[layer]; } -static const char const *dev_format_string[] = { +static const char *dev_format_string[] = { [IPC_FMT] = "FMT", [IPC_RAW] = "RAW", [IPC_RFS] = "RFS", @@ -147,7 +147,7 @@ static inline enum direction opposite(enum direction dir) return (dir == TX) ? RX : TX; } -static const char const *direction_string[] = { +static const char *direction_string[] = { [TX] = "TX", [RX] = "RX" }; @@ -160,7 +160,7 @@ static const inline char *dir_str(enum direction dir) return direction_string[dir]; } -static const char const *udl_string[] = { +static const char *udl_string[] = { [UL] = "UL", [DL] = "DL" }; @@ -173,7 +173,7 @@ static const inline char *udl_str(enum direction dir) return udl_string[dir]; } -static const char const *q_direction_string[] = { +static const char *q_direction_string[] = { [TX] = "TXQ", [RX] = "RXQ" }; @@ -186,7 +186,7 @@ static const inline char *q_dir(enum direction dir) return q_direction_string[dir]; } -static const char const *ipc_direction_string[] = { +static const char *ipc_direction_string[] = { [TX] = "AP->CP", [RX] = "AP<-CP" }; @@ -199,7 +199,7 @@ static const inline char *ipc_dir(enum direction dir) return ipc_direction_string[dir]; } -static const char const *arrow_direction[] = { +static const char *arrow_direction[] = { [TX] = "->", [RX] = "<-" }; @@ -212,7 +212,7 @@ static const inline char *arrow(enum direction dir) return arrow_direction[dir]; } -static const char const *modem_state_string[] = { +static const char *modem_state_string[] = { [STATE_OFFLINE] = "OFFLINE", [STATE_CRASH_RESET] = "CRASH_RESET", [STATE_CRASH_EXIT] = "CRASH_EXIT", -- 2.34.1