[PATCH 1/2] powerpc/smp: Drop superfluous NULL check

Srikar Dronamraju srikar at linux.vnet.ibm.com
Sat Mar 14 01:46:50 AEDT 2020


* Michael Ellerman <mpe at ellerman.id.au> [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 <srikar at linux.vnet.ibm.com>

> Signed-off-by: Michael Ellerman <mpe at 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



More information about the Linuxppc-dev mailing list