LinuxLists.cc - [PATCH] memory: tegra: Fix -Wunused-const-variable

2019-06-13 17:29:42

Subject: [PATCH] memory: tegra: Fix -Wunused-const-variable

2019-06-13 17:58:04

Subject: Re: [PATCH] memory: tegra: Fix -Wunused-const-variable

On Thu, Jun 13, 2019 at 10:28 AM 'Nathan Huckleberry' via Clang Built
Linux <[email protected]> wrote:
> 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

> +#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
--
Thanks,
~Nick Desaulniers

2019-06-13 18:28:46

by Nathan Huckleberry

[permalink] [raw]

Subject: [PATCH v2] 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.

Cc: [email protected]
Link: https://github.com/ClangBuiltLinux/linux/issues/526
Signed-off-by: Nathan Huckleberry <[email protected]>
---
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(-)

diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
index 8f8487bda642..6985a4e33325 100644
--- a/drivers/memory/tegra/tegra124.c
+++ b/drivers/memory/tegra/tegra124.c
@@ -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),
--
2.22.0.rc2.383.gf4fbbf30c2-goog

2019-06-13 18:30:16

by Nick Desaulniers

[permalink] [raw]

Subject: Re: [PATCH v2] memory: tegra: Fix -Wunused-const-variable

On Thu, Jun 13, 2019 at 11:26 AM 'Nathan Huckleberry' via Clang Built
Linux <[email protected]> wrote:
> Changes from v1 -> v2:
> * Moved definition of tegra124_mc_emem_regs into existing ifdef

Thanks for sending the v2, LGTM.
Reviewed-by: Nick Desaulniers <[email protected]>

> --- a/drivers/memory/tegra/tegra124.c
> +++ b/drivers/memory/tegra/tegra124.c
> @@ -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
> +};
> +

--
Thanks,
~Nick Desaulniers

2019-06-14 16:03:16

by Thierry Reding

[permalink] [raw]

Subject: Re: [PATCH v2] memory: tegra: Fix -Wunused-const-variable

On Thu, Jun 13, 2019 at 11:26:10AM -0700, Nathan Huckleberry wrote:
> 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.
>
> Cc: [email protected]
> Link: https://github.com/ClangBuiltLinux/linux/issues/526
> Signed-off-by: Nathan Huckleberry <[email protected]>
> ---
> 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(-)

Applied, thanks.

Thierry

Attachments:

(No filename) (875.00 B)
signature.asc (849.00 B)
Download all attachments