From patchwork Mon Apr 16 16:58:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 10343491 X-Patchwork-Delegate: iweiny@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 911E5601D7 for ; Mon, 16 Apr 2018 16:58:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CF3428806 for ; Mon, 16 Apr 2018 16:58:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70C5828818; Mon, 16 Apr 2018 16:58:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0EC2728806 for ; Mon, 16 Apr 2018 16:58:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E19A32244E3E3; Mon, 16 Apr 2018 09:58:18 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=74.125.82.193; helo=mail-ot0-f193.google.com; envelope-from=robherring2@gmail.com; receiver=linux-nvdimm@lists.01.org Received: from mail-ot0-f193.google.com (mail-ot0-f193.google.com [74.125.82.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 64BFA2263DD97 for ; Mon, 16 Apr 2018 09:58:18 -0700 (PDT) Received: by mail-ot0-f193.google.com with SMTP id y46-v6so18182161otd.4 for ; Mon, 16 Apr 2018 09:58:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aU1Tke6NkqfNHkqpsgL1uPHR1/KptLI4fxyAWw5gyqQ=; b=HjCaibpi6cxaYyIew55yrvD2nzgUaEPnKcFYB9RBidP/sbBcEBNVIQ23vO109h/SyH CTZyAKla1E+0d3EA9lvi848M0ElC6MEjCs6fDcxqbVAdB+u6wxe+/1DtU7UExk5eCZ0E LMBSCJi/gkwfF9N0ErpVagXNudBAh2FL28vr+4Wj4Mtw4A2EvrDV9B6y90x8cC3LnybK KjEO5cFjxtKsODdISpYknGVcbaiV/rh2iHObrp4shACOxJS/7NipnOCYhy7AeEnuWdEI hD4yBNDnS+oJcuCe5jQcU5yX75q8FG8Oaxhc+vl4C8gb0SkWigFxWtx0eQVBmfGBC1iW ihhQ== X-Gm-Message-State: ALQs6tBpR1AzAsj8qCldcfOCb7OD2LEilEx9It/O1HR3B4PeO8JbF4aA G7SY2ERbMIfX1r0uooLvZQ== X-Google-Smtp-Source: AIpwx49Gwi7F6s7S9L0G790k4+m3p3KCTiAcdAlx29WhPkJtA4tzaaxptdh6Jj5A+O988UHeO/OtGA== X-Received: by 2002:a9d:1311:: with SMTP id f17-v6mr11621880ote.15.1523897897537; Mon, 16 Apr 2018 09:58:17 -0700 (PDT) Received: from xps15.herring.priv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id e19-v6sm7744513otf.23.2018.04.16.09.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 09:58:17 -0700 (PDT) From: Rob Herring To: Dan Williams Subject: [PATCH] libnvdimm, of_pmem: use dev_to_node() instead of of_node_to_nid() Date: Mon, 16 Apr 2018 11:58:16 -0500 Message-Id: <20180416165816.15470-1-robh@kernel.org> X-Mailer: git-send-email 2.14.1 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Oliver O'Halloran Cc: linux-nvdimm@lists.01.org Signed-off-by: Rob Herring --- 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);