[PATCH 1/2] powerpc/smp: Drop superfluous NULL check
Subsystems:
linux for powerpc (32-bit and 64-bit) , the rest
2350d
LANDED
Landed in mainline as 4b4d181d6351 on 2020-03-26.
5 messages,
3 authors,
2020-04-01 · open the first message on its own page
We don't need the NULL check of np, the result is the same because the
OF helpers cope with NULL, of_node_to_nid(NULL) == NUMA_NO_NODE (-1).
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/smp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 37c12e3bab9e..aae61a3b3201 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c @@ -1197,11 +1197,8 @@ int get_physical_package_id(int cpu)
*/
if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR )) {
struct device_node * np = of_get_cpu_node ( cpu , NULL );
- - if ( np ) { - pkg_id = of_node_to_nid ( np ); - of_node_put ( np ); - } + pkg_id = of_node_to_nid ( np ); + of_node_put ( np ); }
#endif /* CONFIG_PPC_SPLPAR */
--
2.21.1
We can avoid the #ifdef by using IS_ENABLED() in the existing
condition check.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/smp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index aae61a3b3201..6d2a3a3666f0 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c @@ -1189,18 +1189,17 @@ int get_physical_package_id(int cpu)
{
int pkg_id = cpu_to_chip_id ( cpu );
- #ifdef CONFIG_PPC_SPLPAR /*
* If the platform is PowerNV or Guest on KVM , ibm , chip - id is
* defined . Hence we would return the chip - id as the result of
* get_physical_package_id .
*/
- if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR )) { + if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR ) && + IS_ENABLED ( CONFIG_PPC_SPLPAR )) { struct device_node * np = of_get_cpu_node ( cpu , NULL );
pkg_id = of_node_to_nid ( np );
of_node_put ( np );
}
- #endif /* CONFIG_PPC_SPLPAR */
return pkg_id ;
} --
2.21.1
* Michael Ellerman [off-list ref] [2020-03-13 22:20:19]:
We don't need the NULL check of np, the result is the same because the
OF helpers cope with NULL, of_node_to_nid(NULL) == NUMA_NO_NODE (-1).
Looks good to me.
Reviewed-by: Srikar Dronamraju <redacted>
quoted hunk Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/smp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 37c12e3bab9e..aae61a3b3201 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c @@ -1197,11 +1197,8 @@ int get_physical_package_id(int cpu)
*/
if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR )) {
struct device_node * np = of_get_cpu_node ( cpu , NULL );
- - if ( np ) { - pkg_id = of_node_to_nid ( np ); - of_node_put ( np ); - } + pkg_id = of_node_to_nid ( np ); + of_node_put ( np ); }
#endif /* CONFIG_PPC_SPLPAR */
--
2.21.1
--
Thanks and Regards
Srikar Dronamraju
* Michael Ellerman [off-list ref] [2020-03-13 22:20:20]:
We can avoid the #ifdef by using IS_ENABLED() in the existing
condition check.
Looks good to me.
Reviewed-by: Srikar Dronamraju <redacted>
quoted hunk Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/smp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index aae61a3b3201..6d2a3a3666f0 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c @@ -1189,18 +1189,17 @@ int get_physical_package_id(int cpu)
{
int pkg_id = cpu_to_chip_id ( cpu );
- #ifdef CONFIG_PPC_SPLPAR /*
* If the platform is PowerNV or Guest on KVM , ibm , chip - id is
* defined . Hence we would return the chip - id as the result of
* get_physical_package_id .
*/
- if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR )) { + if ( pkg_id == -1 && firmware_has_feature ( FW_FEATURE_LPAR ) && + IS_ENABLED ( CONFIG_PPC_SPLPAR )) { struct device_node * np = of_get_cpu_node ( cpu , NULL );
pkg_id = of_node_to_nid ( np );
of_node_put ( np );
}
- #endif /* CONFIG_PPC_SPLPAR */ return pkg_id ;
} --
2.21.1
--
Thanks and Regards
Srikar Dronamraju
On Fri, 2020-03-13 at 11:20:19 UTC, Michael Ellerman wrote: We don't need the NULL check of np, the result is the same because the
OF helpers cope with NULL, of_node_to_nid(NULL) == NUMA_NO_NODE (-1).
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Series applied to powerpc next.
https://git.kernel.org/powerpc/c/4b4d181d63518334070a877ba789211bde77da9e
cheers