| Message ID | 20230601213416.3373599-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | clk: qcom: gcc-ipq6018: remove duplicate initializers | expand |
On Fri, 2 Jun 2023 at 00:34, Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/clk/qcom/gcc-ipq6018.c | 2 -- > 1 file changed, 2 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Thu, 1 Jun 2023 at 23:34, Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for fixing my mess up. Reviewed-by: Robert Marko <robimarko@gmail.com> Regards, Robert > --- > drivers/clk/qcom/gcc-ipq6018.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c > index 48f9bff7c80fb..86b43175b0422 100644 > --- a/drivers/clk/qcom/gcc-ipq6018.c > +++ b/drivers/clk/qcom/gcc-ipq6018.c > @@ -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 >
On Thu, 1 Jun 2023 23:34:12 +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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, > | ^~~ > > [...] Applied, thanks! [1/1] clk: qcom: gcc-ipq6018: remove duplicate initializers commit: 5ae7899765607e97e5eb34486336898c8d9ec654 Best regards,
diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c index 48f9bff7c80fb..86b43175b0422 100644 --- a/drivers/clk/qcom/gcc-ipq6018.c +++ b/drivers/clk/qcom/gcc-ipq6018.c @@ -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),