| Message ID | 20221103070122.340773-1-chenlifu@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 59dc2d94bc12dac53a5d2368ad97ca24e7cc5682 |
| Headers | show |
| Series | [v3,-next] powerpc/powermac: Fix symbol not declared warnings | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 23 jobs. |
Le 03/11/2022 à 08:01, Chen Lifu a écrit : > 1. ppc_override_l2cr and ppc_override_l2cr_value are only used in > l2cr_init() function, remove them and used *l2cr directly. > 2. has_l2cache is not used outside of the file, so mark it static and > do not initialise statics to 0. > > Fixes the following warning: > > arch/powerpc/platforms/powermac/setup.c:73:5: warning: symbol > 'ppc_override_l2cr' was not declared. Should it be static? > arch/powerpc/platforms/powermac/setup.c:74:5: warning: symbol > 'ppc_override_l2cr_value' was not declared. Should it be static? > arch/powerpc/platforms/powermac/setup.c:75:5: warning: symbol > 'has_l2cache' was not declared. Should it be static? > > Signed-off-by: Chen Lifu <chenlifu@huawei.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/platforms/powermac/setup.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c > index 04daa7f0a03c..cb9a3290849a 100644 > --- a/arch/powerpc/platforms/powermac/setup.c > +++ b/arch/powerpc/platforms/powermac/setup.c > @@ -68,13 +68,11 @@ > > #include "pmac.h" > > #undef SHOW_GATWICK_IRQS > > -int ppc_override_l2cr = 0; > -int ppc_override_l2cr_value; > -int has_l2cache = 0; > +static int has_l2cache; > > int pmac_newworld; > > static int current_root_goodness = -1; > > @@ -234,26 +232,21 @@ static void __init l2cr_init(void) > > for_each_of_cpu_node(np) { > const unsigned int *l2cr = > of_get_property(np, "l2cr-value", NULL); > if (l2cr) { > - ppc_override_l2cr = 1; > - ppc_override_l2cr_value = *l2cr; > _set_L2CR(0); > - _set_L2CR(ppc_override_l2cr_value); > + _set_L2CR(*l2cr); > + pr_info("L2CR overridden (0x%x), " > + "backside cache is %s\n", > + *l2cr, ((*l2cr) & 0x80000000) ? > + "enabled" : "disabled"); > } > of_node_put(np); > break; > } > } > - > - if (ppc_override_l2cr) > - printk(KERN_INFO "L2CR overridden (0x%x), " > - "backside cache is %s\n", > - ppc_override_l2cr_value, > - (ppc_override_l2cr_value & 0x80000000) > - ? "enabled" : "disabled"); > } > #endif > > static void __init pmac_setup_arch(void) > {
On Thu, 3 Nov 2022 15:01:22 +0800, Chen Lifu wrote: > 1. ppc_override_l2cr and ppc_override_l2cr_value are only used in > l2cr_init() function, remove them and used *l2cr directly. > 2. has_l2cache is not used outside of the file, so mark it static and > do not initialise statics to 0. > > Fixes the following warning: > > [...] Applied to powerpc/next. [1/1] powerpc/powermac: Fix symbol not declared warnings https://git.kernel.org/powerpc/c/59dc2d94bc12dac53a5d2368ad97ca24e7cc5682 cheers
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 04daa7f0a03c..cb9a3290849a 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -68,13 +68,11 @@ #include "pmac.h" #undef SHOW_GATWICK_IRQS -int ppc_override_l2cr = 0; -int ppc_override_l2cr_value; -int has_l2cache = 0; +static int has_l2cache; int pmac_newworld; static int current_root_goodness = -1; @@ -234,26 +232,21 @@ static void __init l2cr_init(void) for_each_of_cpu_node(np) { const unsigned int *l2cr = of_get_property(np, "l2cr-value", NULL); if (l2cr) { - ppc_override_l2cr = 1; - ppc_override_l2cr_value = *l2cr; _set_L2CR(0); - _set_L2CR(ppc_override_l2cr_value); + _set_L2CR(*l2cr); + pr_info("L2CR overridden (0x%x), " + "backside cache is %s\n", + *l2cr, ((*l2cr) & 0x80000000) ? + "enabled" : "disabled"); } of_node_put(np); break; } } - - if (ppc_override_l2cr) - printk(KERN_INFO "L2CR overridden (0x%x), " - "backside cache is %s\n", - ppc_override_l2cr_value, - (ppc_override_l2cr_value & 0x80000000) - ? "enabled" : "disabled"); } #endif static void __init pmac_setup_arch(void) {
1. ppc_override_l2cr and ppc_override_l2cr_value are only used in l2cr_init() function, remove them and used *l2cr directly. 2. has_l2cache is not used outside of the file, so mark it static and do not initialise statics to 0. Fixes the following warning: arch/powerpc/platforms/powermac/setup.c:73:5: warning: symbol 'ppc_override_l2cr' was not declared. Should it be static? arch/powerpc/platforms/powermac/setup.c:74:5: warning: symbol 'ppc_override_l2cr_value' was not declared. Should it be static? arch/powerpc/platforms/powermac/setup.c:75:5: warning: symbol 'has_l2cache' was not declared. Should it be static? Signed-off-by: Chen Lifu <chenlifu@huawei.com> --- arch/powerpc/platforms/powermac/setup.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)