Skip to contentSkip to conversation

clk: qcom: gcc-ipq6018: remove duplicate initializers

PATCH Applied Arnd Bergmann 4 participants 4 messages Jun 1, 2023 – Jun 13, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: qcom: gcc-ipq6018: remove duplicate initializers

From: Arnd Bergmann <[email protected]>

A recent change added new initializers for .config_ctl_val and .config_ctl_hi_val but left the old values in place:

drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
4155 | .config_ctl_val = 0x240d4828,

      |                           ^~~~~~~~~~

drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
4156 | .config_ctl_hi_val = 0x6,
| ^~~

Remove the unused ones now to avoid confusion.

Fixes f4f0c8acee0e4 ("clk: qcom: gcc-ipq6018: update UBI32 PLL")
---
 drivers/clk/qcom/gcc-ipq6018.c | 2 --
 1 file changed, 2 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +0 -2
index 48f9bff7c80fb..86b43175b0422 100644
@@ -4150,8 +4150,6 @@ static struct clk_branch gcc_dcc_clk = {
 static const struct alpha_pll_config ubi32_pll_config = {
 	.l = 0x3e,
 	.alpha = 0x6667,
-	.config_ctl_val = 0x240d6aa8,
-	.config_ctl_hi_val = 0x3c2,
 	.config_ctl_val = 0x240d4828,
 	.config_ctl_hi_val = 0x6,
 	.main_output_mask = BIT(0),
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

A recent change added new initializers for .config_ctl_val and .config_ctl_hi_val but left the old values in place:

drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
4155 | .config_ctl_val = 0x240d4828,

      |                           ^~~~~~~~~~

drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
4156 | .config_ctl_hi_val = 0x6,
| ^~~

Quoted 7 lines

Remove the unused ones now to avoid confusion.

Fixes f4f0c8acee0e4 ("clk: qcom: gcc-ipq6018: update UBI32 PLL")
---
 drivers/clk/qcom/gcc-ipq6018.c | 2 --
 1 file changed, 2 deletions(-)
Signature · 2 lines
With best wishes
Dmitry
Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

A recent change added new initializers for .config_ctl_val and .config_ctl_hi_val but left the old values in place:

drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
4155 | .config_ctl_val = 0x240d4828,

      |                           ^~~~~~~~~~
Quoted 8 lines

drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
4156 | .config_ctl_hi_val = 0x6,
| ^~~

Remove the unused ones now to avoid confusion.

Fixes f4f0c8acee0e4 ("clk: qcom: gcc-ipq6018: update UBI32 PLL")

Thanks for fixing my mess up.

Regards,
Robert

Quoted 20 lines
---
 drivers/clk/qcom/gcc-ipq6018.c | 2 --
 1 file changed, 2 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +0 -3
index 48f9bff7c80fb..86b43175b0422 100644
@@ -4150,8 +4150,6 @@ static struct clk_branch gcc_dcc_clk = {
 static const struct alpha_pll_config ubi32_pll_config = {
        .l = 0x3e,
        .alpha = 0x6667,
-       .config_ctl_val = 0x240d6aa8,
-       .config_ctl_hi_val = 0x3c2,
        .config_ctl_val = 0x240d4828,
        .config_ctl_hi_val = 0x6,
        .main_output_mask = BIT(0),
--

2.39.2

maintainer Applied
#3 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

A recent change added new initializers for .config_ctl_val and .config_ctl_hi_val but left the old values in place:

Quoted 8 lines

drivers/clk/qcom/gcc-ipq6018.c:4155:27: error: initialized field overwritten [-Werror=override-init]
4155 | .config_ctl_val = 0x240d4828,

      |                           ^~~~~~~~~~

drivers/clk/qcom/gcc-ipq6018.c:4156:30: error: initialized field overwritten [-Werror=override-init]
4156 | .config_ctl_hi_val = 0x6,
| ^~~

[...]

Applied, thanks!

[1/1] clk: qcom: gcc-ipq6018: remove duplicate initializers

      commit: 5ae7899765607e97e5eb34486336898c8d9ec654

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>