Skip to contentSkip to conversation

clk: qoriq: Fix -Wunused-const-variable

PATCH Applied Nathan Huckleberry 4 participants 4 messages Jun 27, 2019 – Aug 7, 2019 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: qoriq: Fix -Wunused-const-variable

drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1

drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2

In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.

---
 drivers/clk/clk-qoriq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-qoriq.c +1 -1
index 4739a47ec8bd..0f8870527940 100644
@@ -678,7 +678,7 @@ static const struct clockgen_chipinfo chipinfo[] = {
 		.guts_compat = "fsl,qoriq-device-config-1.0",
 		.init_periph = p5020_init_periph,
 		.cmux_groups = {
-			&p2041_cmux_grp1, &p2041_cmux_grp2
+			&p5020_cmux_grp1, &p5020_cmux_grp2
 		},
 		.cmux_to_group = {
 			0, 1, -1
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Nathan Huckleberry' via Clang Built Linux

drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1

Quoted 7 lines

drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2

In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.

oops! Further, the definitions of p5020_cmux_grp1/p5020_cmux_grp2 are subtly different than p2041_cmux_grp1/p2041_cmux_grp2. Definitely looks copy+pasta related; I agree with your assessment. (Also, it's interesting to see this sparse array initializer syntax). Thanks for the patch.

Quoted 18 lines
---
 drivers/clk/clk-qoriq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-qoriq.c +1 -1
index 4739a47ec8bd..0f8870527940 100644
@@ -678,7 +678,7 @@ static const struct clockgen_chipinfo chipinfo[] = {
                .guts_compat = "fsl,qoriq-device-config-1.0",
                .init_periph = p5020_init_periph,
                .cmux_groups = {
-                       &p2041_cmux_grp1, &p2041_cmux_grp2
+                       &p5020_cmux_grp1, &p5020_cmux_grp2
Signature · 2 lines
Thanks,
~Nick Desaulniers
Acked-by on v1 1/1
#2 lore raw
In reply to Nathan Huckleberry
Quoted 8 lines · Nathan Huckleberry

drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1

drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2

Quoted 7 lines

In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.

-Scott

maintainer Applied
#3 lore raw
In reply to Nathan Huckleberry

Quoting Nathan Huckleberry (2019-06-27 15:06:42)

Quoted 8 lines

drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1

drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2

Quoted 8 lines

In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.

---

Applied to clk-next