memory: tegra: Fix -Wunused-const-variable
Subsystems (2)
PATCH 1/1 memory: tegra: Fix -Wunused-const-variable
Clang produces the following warning
drivers/memory/tegra/tegra124.c:36:28: warning: unused variable 'tegra124_mc_emem_regs' [-Wunused-const-variable]
static const unsigned long tegra124_mc_emem_regs[] = {
^The only usage of this variable is from within an ifdef. It seems logical to move the variable into the ifdef as well.
--- drivers/memory/tegra/tegra124.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/memory/tegra/tegra124.c +2 -0
@@ -33,6 +33,7 @@#define MC_EMEM_ARB_MISC1 0xdc#define MC_EMEM_ARB_RING1_THROTTLE 0xe0 +#ifdef CONFIG_ARCH_TEGRA_124_SOC static const unsigned long tegra124_mc_emem_regs[] = {MC_EMEM_ARB_CFG , MC_EMEM_ARB_OUTSTANDING_REQ,
@@ -54,6 +55,7 @@ static const unsigned long tegra124_mc_emem_regs[] = {MC_EMEM_ARB_MISC1 ,MC_EMEM_ARB_RING1_THROTTLE }; +#endif static const struct tegra_mc_client tegra124_mc_clients[] = { {
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
Quoted 2 lines · Nathan Huckleberry' via Clang Built Linux
The only usage of this variable is from within an ifdef. It seems logical to move the variable into the ifdef as well.
Thanks for the patch, I agree but have the same thoughts as in:
https://lkml.org/lkml/2019/6/13/1438
Quoted 9 lines
drivers/memory/tegra/tegra124.c +2
-0+#ifdef CONFIG_ARCH_TEGRA_124_SOC static const unsigned long tegra124_mc_emem_regs[] = {MC_EMEM_ARB_CFG , MC_EMEM_ARB_OUTSTANDING_REQ,@@ -54,6 +55,7 @@ static const unsigned long tegra124_mc_emem_regs[] = {MC_EMEM_ARB_MISC1 ,MC_EMEM_ARB_RING1_THROTTLE }; +#endif
Signature · 2 lines
Thanks, ~Nick Desaulniers
PATCH v2 1/1 memory: tegra: Fix -Wunused-const-variable
Clang produces the following warning
drivers/memory/tegra/tegra124.c:36:28: warning: unused variable 'tegra124_mc_emem_regs' [-Wunused-const-variable]
static const unsigned long tegra124_mc_emem_regs[] = {
^The only usage of this variable is from within an ifdef. It seems logical to move the variable into the ifdef as well.
---
Changes from v1 -> v2:
* Moved definition of tegra124_mc_emem_regs into existing ifdef
drivers/memory/tegra/tegra124.c | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/memory/tegra/tegra124.c +22 -22
@@ -33,28 +33,6 @@#define MC_EMEM_ARB_MISC1 0xdc#define MC_EMEM_ARB_RING1_THROTTLE 0xe0 -static const unsigned long tegra124_mc_emem_regs[] = { -MC_EMEM_ARB_CFG , -MC_EMEM_ARB_OUTSTANDING_REQ , -MC_EMEM_ARB_TIMING_RCD , -MC_EMEM_ARB_TIMING_RP , -MC_EMEM_ARB_TIMING_RC , -MC_EMEM_ARB_TIMING_RAS , -MC_EMEM_ARB_TIMING_FAW , -MC_EMEM_ARB_TIMING_RRD , -MC_EMEM_ARB_TIMING_RAP2PRE , -MC_EMEM_ARB_TIMING_WAP2PRE , -MC_EMEM_ARB_TIMING_R2R , -MC_EMEM_ARB_TIMING_W2W , -MC_EMEM_ARB_TIMING_R2W , -MC_EMEM_ARB_TIMING_W2R , -MC_EMEM_ARB_DA_TURNS , -MC_EMEM_ARB_DA_COVERS , -MC_EMEM_ARB_MISC0 , -MC_EMEM_ARB_MISC1 , -MC_EMEM_ARB_RING1_THROTTLE -}; -static const struct tegra_mc_client tegra124_mc_clients[] = { { .id =0x00 ,
@@ -1049,6 +1027,28 @@ static const struct tegra_mc_reset tegra124_mc_resets[] = { };#ifdef CONFIG_ARCH_TEGRA_124_SOC +static const unsigned long tegra124_mc_emem_regs[] = { +MC_EMEM_ARB_CFG , +MC_EMEM_ARB_OUTSTANDING_REQ , +MC_EMEM_ARB_TIMING_RCD , +MC_EMEM_ARB_TIMING_RP , +MC_EMEM_ARB_TIMING_RC , +MC_EMEM_ARB_TIMING_RAS , +MC_EMEM_ARB_TIMING_FAW , +MC_EMEM_ARB_TIMING_RRD , +MC_EMEM_ARB_TIMING_RAP2PRE , +MC_EMEM_ARB_TIMING_WAP2PRE , +MC_EMEM_ARB_TIMING_R2R , +MC_EMEM_ARB_TIMING_W2W , +MC_EMEM_ARB_TIMING_R2W , +MC_EMEM_ARB_TIMING_W2R , +MC_EMEM_ARB_DA_TURNS , +MC_EMEM_ARB_DA_COVERS , +MC_EMEM_ARB_MISC0 , +MC_EMEM_ARB_MISC1 , +MC_EMEM_ARB_RING1_THROTTLE +}; +static const struct tegra_smmu_soc tegra124_smmu_soc = { .clients = tegra124_mc_clients, .num_clients = ARRAY_SIZE(tegra124_mc_clients),
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
Quoted 2 lines · Nathan Huckleberry' via Clang Built Linux
Changes from v1 -> v2:
* Moved definition oftegra124_mc_emem_regsinto existing ifdef
Thanks for sending the v2, LGTM.
Quoted 57 lines
drivers/memory/tegra/tegra124.c +22
-22@@ -33,28 +33,6 @@#define MC_EMEM_ARB_MISC1 0xdc#define MC_EMEM_ARB_RING1_THROTTLE 0xe0 -static const unsigned long tegra124_mc_emem_regs[] = { -MC_EMEM_ARB_CFG , -MC_EMEM_ARB_OUTSTANDING_REQ , -MC_EMEM_ARB_TIMING_RCD , -MC_EMEM_ARB_TIMING_RP , -MC_EMEM_ARB_TIMING_RC , -MC_EMEM_ARB_TIMING_RAS , -MC_EMEM_ARB_TIMING_FAW , -MC_EMEM_ARB_TIMING_RRD , -MC_EMEM_ARB_TIMING_RAP2PRE , -MC_EMEM_ARB_TIMING_WAP2PRE , -MC_EMEM_ARB_TIMING_R2R , -MC_EMEM_ARB_TIMING_W2W , -MC_EMEM_ARB_TIMING_R2W , -MC_EMEM_ARB_TIMING_W2R , -MC_EMEM_ARB_DA_TURNS , -MC_EMEM_ARB_DA_COVERS , -MC_EMEM_ARB_MISC0 , -MC_EMEM_ARB_MISC1 , -MC_EMEM_ARB_RING1_THROTTLE -}; -static const struct tegra_mc_client tegra124_mc_clients[] = { { .id =0x00 ,@@ -1049,6 +1027,28 @@ static const struct tegra_mc_reset tegra124_mc_resets[] = { };#ifdef CONFIG_ARCH_TEGRA_124_SOC +static const unsigned long tegra124_mc_emem_regs[] = { +MC_EMEM_ARB_CFG , +MC_EMEM_ARB_OUTSTANDING_REQ , +MC_EMEM_ARB_TIMING_RCD , +MC_EMEM_ARB_TIMING_RP , +MC_EMEM_ARB_TIMING_RC , +MC_EMEM_ARB_TIMING_RAS , +MC_EMEM_ARB_TIMING_FAW , +MC_EMEM_ARB_TIMING_RRD , +MC_EMEM_ARB_TIMING_RAP2PRE , +MC_EMEM_ARB_TIMING_WAP2PRE , +MC_EMEM_ARB_TIMING_R2R , +MC_EMEM_ARB_TIMING_W2W , +MC_EMEM_ARB_TIMING_R2W , +MC_EMEM_ARB_TIMING_W2R , +MC_EMEM_ARB_DA_TURNS , +MC_EMEM_ARB_DA_COVERS , +MC_EMEM_ARB_MISC0 , +MC_EMEM_ARB_MISC1 , +MC_EMEM_ARB_RING1_THROTTLE +}; +
Signature · 2 lines
Thanks, ~Nick Desaulniers
Thierry Reding
AppliedQuoted 10 lines · Nathan Huckleberry
Clang produces the following warning
drivers/memory/tegra/tegra124.c:36:28: warning: unused variable 'tegra124_mc_emem_regs' [-Wunused-const-variable]static const unsigned long tegra124_mc_emem_regs[] = { ^The only usage of this variable is from within an ifdef. It seems logical to move the variable into the ifdef as well.
Quoted 8 lines
Signed-off-by Nathan Huckleberry <[email protected]>---
Changes from v1 -> v2:
* Moved definition oftegra124_mc_emem_regsinto existing ifdefdrivers/memory/tegra/tegra124.c | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-)
Applied, thanks.
Thierry