clk: tegra: Fix sparse warning for pll_m
Subsystems (3)
Jon Hunter
maintainerPATCH 1/3 clk: tegra: Fix sparse warning for pll_m
Sparse generates the following warning for the pll_m params structure:
drivers/clk/tegra/clk-tegra210.c:1569:10: warning: Initializer entry
defined twicedrivers/clk/tegra/clk-tegra210.c:1570:10: also defined here
Fix this by correcting the index for the MISC1 register.
--- drivers/clk/tegra/clk-tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra210.c +1 -1
@@ -1567,7 +1567,7 @@ static struct tegra_clk_pll_params pll_m_params = { .iddq_bit_idx = PLLM_IDDQ_BIT, .max_p = PLL_QLIN_PDIV_MAX, .ext_misc_reg[0] = PLLM_MISC0, - .ext_misc_reg[0] = PLLM_MISC1, + .ext_misc_reg[1] = PLLM_MISC1, .round_p_to_pdiv = pll_qlin_p_to_pdiv, .pdiv_tohw = pll_qlin_pdiv_to_hw, .div_nmp = &pllm_nmp,
Signature · 1 line
2.1.4
Jon Hunter
maintainerPATCH 2/3 clk: tegra210: Fix sparse warnings for functions not declared as static
Sparse reports the following warnings for functions in clk-tegra210.c that should be declared as static:
drivers/clk/tegra/clk-tegra210.c:460:6: warning: symbol
'tegra210_pllcx_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:485:6: warning: symbol
'_pllc_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:490:6: warning: symbol
'_pllc2_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:495:6: warning: symbol
'_pllc3_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:500:6: warning: symbol
'_plla1_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:510:6: warning: symbol
'tegra210_plla_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:562:6: warning: symbol
'tegra210_plld_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:701:6: warning: symbol
'tegra210_plld2_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:709:6: warning: symbol
'tegra210_plldp_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:722:6: warning: symbol
'tegra210_pllc4_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:731:6: warning: symbol
'tegra210_pllre_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:844:6: warning: symbol
'tegra210_pllx_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:904:6: warning: symbol
'tegra210_pllmb_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:963:6: warning: symbol
'tegra210_pllp_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:1025:6: warning: symbol
'tegra210_pllu_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:1215:15: warning: symbol
'tegra210_clk_adjust_vco_min' was not declared. Should it be static?
Fix this by declaring the above as static.
--- drivers/clk/tegra/clk-tegra210.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
drivers/clk/tegra/clk-tegra210.c +19 -17
@@ -457,7 +457,8 @@ static void pllcx_check_defaults(struct tegra_clk_pll_params *params) PLLCX_MISC3_WRITE_MASK); } -void tegra210_pllcx_set_defaults (const char *name,struct tegra_clk_pll *pllcx) +static void tegra210_pllcx_set_defaults (const char *name, +struct tegra_clk_pll *pllcx) { pllcx->params->defaults_set = true;
@@ -482,22 +483,22 @@ void tegra210_pllcx_set_defaults(const char *name, struct tegra_clk_pll *pllcx)udelay (1 ); } -void _pllc_set_defaults (struct tegra_clk_pll *pllcx) +static void _pllc_set_defaults (struct tegra_clk_pll *pllcx) {tegra210_pllcx_set_defaults ("PLL_C" , pllcx); } -void _pllc2_set_defaults (struct tegra_clk_pll *pllcx) +static void _pllc2_set_defaults (struct tegra_clk_pll *pllcx) {tegra210_pllcx_set_defaults ("PLL_C2" , pllcx); } -void _pllc3_set_defaults (struct tegra_clk_pll *pllcx) +static void _pllc3_set_defaults (struct tegra_clk_pll *pllcx) {tegra210_pllcx_set_defaults ("PLL_C3" , pllcx); } -void _plla1_set_defaults (struct tegra_clk_pll *pllcx) +static void _plla1_set_defaults (struct tegra_clk_pll *pllcx) {tegra210_pllcx_set_defaults ("PLL_A1" , pllcx); }
@@ -507,7 +508,7 @@ void _plla1_set_defaults(struct tegra_clk_pll *pllcx)* PLL with dynamic ramp and fractional SDM. Dynamic ramp is not used. * Fractional SDM is allowed to provide exact audio rates. */ -void tegra210_plla_set_defaults (struct tegra_clk_pll *plla) +static void tegra210_plla_set_defaults (struct tegra_clk_pll *plla) {u32 mask;u32 val =readl_relaxed (clk_base + plla->params->base_reg);
@@ -559,7 +560,7 @@ void tegra210_plla_set_defaults(struct tegra_clk_pll *plla)* PLLD * PLL with fractional SDM. */ -void tegra210_plld_set_defaults (struct tegra_clk_pll *plld) +static void tegra210_plld_set_defaults (struct tegra_clk_pll *plld) {u32 val;u32 mask =0xffff ;
@@ -698,7 +699,7 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss,udelay (1 ); } -void tegra210_plld2_set_defaults (struct tegra_clk_pll *plld2) +static void tegra210_plld2_set_defaults (struct tegra_clk_pll *plld2) { plldss_defaults("PLL_D2", plld2, PLLD2_MISC0_DEFAULT_VALUE, PLLD2_MISC1_CFG_DEFAULT_VALUE,
@@ -706,7 +707,7 @@ void tegra210_plld2_set_defaults(struct tegra_clk_pll *plld2) PLLD2_MISC3_CTRL2_DEFAULT_VALUE); } -void tegra210_plldp_set_defaults (struct tegra_clk_pll *plldp) +static void tegra210_plldp_set_defaults (struct tegra_clk_pll *plldp) { plldss_defaults("PLL_DP", plldp, PLLDP_MISC0_DEFAULT_VALUE, PLLDP_MISC1_CFG_DEFAULT_VALUE,
@@ -719,7 +720,7 @@ void tegra210_plldp_set_defaults(struct tegra_clk_pll *plldp)* Base and misc0 layout is the same as PLLD2/PLLDP, but no SDM/SSC support. * VCO is exposed to the clock tree via fixed 1/3 and 1/5 dividers. */ -void tegra210_pllc4_set_defaults (struct tegra_clk_pll *pllc4) +static void tegra210_pllc4_set_defaults (struct tegra_clk_pll *pllc4) {plldss_defaults ("PLL_C4" , pllc4,PLLC4_MISC0_DEFAULT_VALUE ,0 ,0 ,0 ); }
@@ -728,7 +729,7 @@ void tegra210_pllc4_set_defaults(struct tegra_clk_pll *pllc4)* PLLRE * VCO is exposed to the clock tree directly along with post-divider output */ -void tegra210_pllre_set_defaults (struct tegra_clk_pll *pllre) +static void tegra210_pllre_set_defaults (struct tegra_clk_pll *pllre) {u32 mask;u32 val =readl_relaxed (clk_base + pllre->params->base_reg);
@@ -841,7 +842,7 @@ static void pllx_check_defaults(struct tegra_clk_pll *pll) PLLX_MISC5_WRITE_MASK); } -void tegra210_pllx_set_defaults (struct tegra_clk_pll *pllx) +static void tegra210_pllx_set_defaults (struct tegra_clk_pll *pllx) {u32 val;u32 step_a, step_b;
@@ -901,7 +902,7 @@ void tegra210_pllx_set_defaults(struct tegra_clk_pll *pllx) }/* PLLMB */ -void tegra210_pllmb_set_defaults (struct tegra_clk_pll *pllmb) +static void tegra210_pllmb_set_defaults (struct tegra_clk_pll *pllmb) {u32 mask, val =readl_relaxed (clk_base + pllmb->params->base_reg);
@@ -960,7 +961,7 @@ static void pllp_check_defaults(struct tegra_clk_pll *pll, bool enabled) ~mask & PLLP_MISC1_WRITE_MASK); } -void tegra210_pllp_set_defaults (struct tegra_clk_pll *pllp) +static void tegra210_pllp_set_defaults (struct tegra_clk_pll *pllp) {u32 mask;u32 val =readl_relaxed (clk_base + pllp->params->base_reg);
@@ -1022,7 +1023,7 @@ static void pllu_check_defaults(struct tegra_clk_pll *pll, bool hw_control) ~mask & PLLU_MISC1_WRITE_MASK); } -void tegra210_pllu_set_defaults (struct tegra_clk_pll *pllu) +static void tegra210_pllu_set_defaults (struct tegra_clk_pll *pllu) {u32 val =readl_relaxed (clk_base + pllu->params->base_reg);
@@ -1212,8 +1213,9 @@ static void tegra210_clk_pll_set_gain(struct tegra_clk_pll_freq_table *cfg) cfg->m *=PLL_SDM_COEFF ; } -unsigned long tegra210_clk_adjust_vco_min (struct tegra_clk_pll_params *params, -unsigned long parent_rate) +static unsigned long +tegra210_clk_adjust_vco_min (struct tegra_clk_pll_params *params, +unsigned long parent_rate) {unsigned long vco_min = params->vco_min;
Signature · 1 line
2.1.4
Re: [PATCH 2/3] clk: tegra210: Fix sparse warnings for functions not declared as static
Quoted 44 lines · Jon Hunter
Sparse reports the following warnings for functions in
clk-tegra210.cthat should be declared as static:
drivers/clk/tegra/clk-tegra210.c:460:6: warning: symbol
'tegra210_pllcx_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:485:6: warning: symbol
'_pllc_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:490:6: warning: symbol
'_pllc2_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:495:6: warning: symbol
'_pllc3_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:500:6: warning: symbol
'_plla1_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:510:6: warning: symbol
'tegra210_plla_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:562:6: warning: symbol
'tegra210_plld_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:701:6: warning: symbol
'tegra210_plld2_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:709:6: warning: symbol
'tegra210_plldp_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:722:6: warning: symbol
'tegra210_pllc4_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:731:6: warning: symbol
'tegra210_pllre_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:844:6: warning: symbol
'tegra210_pllx_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:904:6: warning: symbol
'tegra210_pllmb_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:963:6: warning: symbol
'tegra210_pllp_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:1025:6: warning: symbol
'tegra210_pllu_set_defaults' was not declared. Should it be static?drivers/clk/tegra/clk-tegra210.c:1215:15: warning: symbol
'tegra210_clk_adjust_vco_min' was not declared. Should it be static?Fix this by declaring the above as static.
Fixes b31eba5ff3f7 ("clk: tegra: Add support for Tegra210 clocks")Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra210.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
...
Signature · 1 line
nvpublic
Jon Hunter
maintainerPATCH 3/3 clk: tegra-super: Fix sparse warnings for functions not declared as static
In reply to Jon HunterSparse reports the following warnings for structures and functions that should be declared static:
drivers/clk/tegra/clk-tegra-super-gen4.c:70:35: warning: symbol
'tegra_super_gen_info_gen4' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:96:35: warning: symbol
'tegra_super_gen_info_gen5' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:174:13: warning: symbol
'tegra_super_clk_init' was not declared. Should it be static?
Fix this by making the above static.
--- drivers/clk/tegra/clk-tegra-super-gen4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/tegra/clk-tegra-super-gen4.c +3 -3
@@ -67,7 +67,7 @@ static const char *cclk_lp_parents[] = { "clk_m", "pll_c", "clk_32k", "pll_m","pll_p" ,"pll_p_out4" ,"unused" , "unused", "pll_x", "pll_x_out0" }; -const struct tegra_super_gen_info tegra_super_gen_info_gen4 = { +static const struct tegra_super_gen_info tegra_super_gen_info_gen4 = { .gen = gen4, .sclk_parents = sclk_parents, .cclk_g_parents = cclk_g_parents,
@@ -93,7 +93,7 @@ static const char *cclk_lp_parents_gen5[] = { "clk_m", "unused", "clk_32k", "unu"unused" ,"unused" ,"unused" ,"unused" , "dfllCPU_out" }; -const struct tegra_super_gen_info tegra_super_gen_info_gen5 = { +static const struct tegra_super_gen_info tegra_super_gen_info_gen5 = { .gen = gen5, .sclk_parents = sclk_parents_gen5, .cclk_g_parents = cclk_g_parents_gen5,
@@ -171,7 +171,7 @@ static void __init tegra_sclk_init(void __iomem *clk_base, *dt_clk = clk; } -void __init tegra_super_clk_init(void __iomem *clk_base, +static void __init tegra_super_clk_init(void __iomem *clk_base, void __iomem *pmc_base, struct tegra_clk *tegra_clks, struct tegra_clk_pll_params *params,
Signature · 1 line
2.1.4
Re: [PATCH 3/3] clk: tegra-super: Fix sparse warnings for functions not declared as static
Quoted 18 lines · Jon Hunter
Sparse reports the following warnings for structures and functions that should be declared static:
drivers/clk/tegra/clk-tegra-super-gen4.c:70:35: warning: symbol
'tegra_super_gen_info_gen4' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:96:35: warning: symbol
'tegra_super_gen_info_gen5' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:174:13: warning: symbol
'tegra_super_clk_init' was not declared. Should it be static?Fix this by making the above static.
Fixes 88467d220119 ("clk: tegra: Add Super Gen5 Logic")Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra-super-gen4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
...
Signature · 1 line
nvpublic
Re: [PATCH 3/3] clk: tegra-super: Fix sparse warnings for functions not declared as static
Quoted 15 lines · Rhyland Klein
Quoted 14 lines · Jon Hunter
Sparse reports the following warnings for structures and functions that should be declared static:
drivers/clk/tegra/clk-tegra-super-gen4.c:70:35: warning: symbol
'tegra_super_gen_info_gen4' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:96:35: warning: symbol
'tegra_super_gen_info_gen5' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:174:13: warning: symbol
'tegra_super_clk_init' was not declared. Should it be static?Fix this by making the above static.
Fixes 88467d220119 ("clk: tegra: Add Super Gen5 Logic")
Quoted 8 lines
Quoted 4 lines
Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra-super-gen4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)...
Acked-by Rhyland Klein <[email protected]>
Actually, Don't you need to change the function declarations in drivers/clk/tegra/clk.h for tegra_super_clk_gen[4|5]_init otherwise you will get mismatches with one being declared static and the other not?
-rhyland
Signature · 1 line
nvpublic
Jon Hunter
maintainerRe: [PATCH 3/3] clk: tegra-super: Fix sparse warnings for functions not declared as static
Quoted 20 lines · Rhyland Klein
Quoted 19 lines · Rhyland Klein
Quoted 18 lines · Jon Hunter
Sparse reports the following warnings for structures and functions that should be declared static:
drivers/clk/tegra/clk-tegra-super-gen4.c:70:35: warning: symbol
'tegra_super_gen_info_gen4' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:96:35: warning: symbol
'tegra_super_gen_info_gen5' was not declared. Should it be static?drivers/clk/tegra/clk-tegra-super-gen4.c:174:13: warning: symbol
'tegra_super_clk_init' was not declared. Should it be static?Fix this by making the above static.
Fixes 88467d220119 ("clk: tegra: Add Super Gen5 Logic")Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra-super-gen4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 8 lines
Quoted 4 lines
...
Acked-by Rhyland Klein <[email protected]>Actually, Don't you need to change the function declarations in
drivers/clk/tegra/clk.hfor tegra_super_clk_gen[4|5]_init otherwise you will get mismatches with one being declared static and the other not?
So this patch does not touch the functions tegra_super_clk_gen[4|5]_init() and these should definitely not be static. This patch just makes the structures tegra_super_gen_info_gen[4|5] and the function tegra_super_clk_init() static. None of these are referenced outside clk-tegra-super-gen4.c.
Cheers
Jon
Quoted 21 lines · Jon Hunter
Sparse generates the following warning for the
pll_mparams structure:
drivers/clk/tegra/clk-tegra210.c:1569:10: warning: Initializer entry
defined twicedrivers/clk/tegra/clk-tegra210.c:1570:10: also defined hereFix this by correcting the index for the MISC1 register.
Fixes b31eba5ff3f7 ("clk: tegra: Add support for Tegra210 clocks")Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/tegra/clk-tegra210.c +0
-0
drivers/clk/tegra/clk-tegra210.c static struct tegra_clk_pll_params pll_m_params = { · line 1573
Quoted 8 lines
drivers/clk/tegra/clk-tegra210.c +1
-1@@ -1567,7 +1567,7 @@ static struct tegra_clk_pll_params pll_m_params = { .iddq_bit_idx = PLLM_IDDQ_BIT, .max_p = PLL_QLIN_PDIV_MAX, .ext_misc_reg[0] = PLLM_MISC0, - .ext_misc_reg[0] = PLLM_MISC1, + .ext_misc_reg[1] = PLLM_MISC1, .round_p_to_pdiv = pll_qlin_p_to_pdiv, .pdiv_tohw = pll_qlin_pdiv_to_hw, .div_nmp = &pllm_nmp,
Signature · 1 line
nvpublic
Quoted 6 lines · Jon Hunter
Sparse generates the following warning for the
pll_mparams structure:
drivers/clk/tegra/clk-tegra210.c:1569:10: warning: Initializer entry
defined twicedrivers/clk/tegra/clk-tegra210.c:1570:10: also defined here
Quoted 8 lines
Fix this by correcting the index for the MISC1 register.
Fixes b31eba5ff3f7 ("clk: tegra: Add support for Tegra210 clocks")Signed-off-by Jon Hunter <[email protected]>--- drivers/clk/tegra/clk-tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
All three patches applied.
Thanks,
Thierry