| Message ID | 20180416165816.15470-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Delegated to: | Ira Weiny |
| Headers | show |
On Mon, Apr 16, 2018 at 9:58 AM, Rob Herring <robh@kernel.org> wrote: > Remove the direct dependency on of_node_to_nid() by using dev_to_node() > instead. Any DT platform device will have its NUMA node id set when the > device is created. > > With this, commit 291717b6fbdb ("libnvdimm, of_pmem: workaround OF_NUMA=n > build error") can be reverted. > > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Oliver O'Halloran <oohall@gmail.com> > Cc: linux-nvdimm@lists.01.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/nvdimm/of_pmem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c > index 85013bad35de..0a701837dfc0 100644 > --- a/drivers/nvdimm/of_pmem.c > +++ b/drivers/nvdimm/of_pmem.c > @@ -67,7 +67,7 @@ static int of_pmem_region_probe(struct platform_device *pdev) > */ > memset(&ndr_desc, 0, sizeof(ndr_desc)); > ndr_desc.attr_groups = region_attr_groups; > - ndr_desc.numa_node = of_node_to_nid(np); > + ndr_desc.numa_node = dev_to_node(&pdev->dev); > ndr_desc.res = &pdev->resource[i]; > ndr_desc.of_node = np; > set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); Thanks Rob, we'll get this queued up for 4.17-rc2.
diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c index 85013bad35de..0a701837dfc0 100644 --- a/drivers/nvdimm/of_pmem.c +++ b/drivers/nvdimm/of_pmem.c @@ -67,7 +67,7 @@ static int of_pmem_region_probe(struct platform_device *pdev) */ memset(&ndr_desc, 0, sizeof(ndr_desc)); ndr_desc.attr_groups = region_attr_groups; - ndr_desc.numa_node = of_node_to_nid(np); + ndr_desc.numa_node = dev_to_node(&pdev->dev); ndr_desc.res = &pdev->resource[i]; ndr_desc.of_node = np; set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
Remove the direct dependency on of_node_to_nid() by using dev_to_node() instead. Any DT platform device will have its NUMA node id set when the device is created. With this, commit 291717b6fbdb ("libnvdimm, of_pmem: workaround OF_NUMA=n build error") can be reverted. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Oliver O'Halloran <oohall@gmail.com> Cc: linux-nvdimm@lists.01.org Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/nvdimm/of_pmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)