Dan Williams <dan.j.williams@xxxxxxxxx> writes:
> Now that the core exports numa_map_to_online_node() switch to that
> instead of the locally coded duplicate.
>
> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
cheers
> Cc: "Oliver O'Halloran" <oohall@xxxxxxxxx>
> Reported-by: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
> ---
> arch/powerpc/platforms/pseries/papr_scm.c | 21 +--------------------
> 1 file changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
> index 33aa59e666e5..ef81515f3b6a 100644
> --- a/arch/powerpc/platforms/pseries/papr_scm.c
> +++ b/arch/powerpc/platforms/pseries/papr_scm.c
> @@ -284,25 +284,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
> return 0;
> }
>
> -static inline int papr_scm_node(int node)
> -{
> - int min_dist = INT_MAX, dist;
> - int nid, min_node;
> -
> - if ((node == NUMA_NO_NODE) || node_online(node))
> - return node;
> -
> - min_node = first_online_node;
> - for_each_online_node(nid) {
> - dist = node_distance(node, nid);
> - if (dist < min_dist) {
> - min_dist = dist;
> - min_node = nid;
> - }
> - }
> - return min_node;
> -}
> -
> static int papr_scm_nvdimm_init(struct papr_scm_priv *p)
> {
> struct device *dev = &p->pdev->dev;
> @@ -347,7 +328,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)
>
> memset(&ndr_desc, 0, sizeof(ndr_desc));
> target_nid = dev_to_node(&p->pdev->dev);
> - online_nid = papr_scm_node(target_nid);
> + online_nid = numa_map_to_online_node(target_nid);
> ndr_desc.numa_node = online_nid;
> ndr_desc.target_node = target_nid;
> ndr_desc.res = &p->res;
