From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751482AbdKYL5E (ORCPT ); Sat, 25 Nov 2017 06:57:04 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33202 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbdKYL5D (ORCPT ); Sat, 25 Nov 2017 06:57:03 -0500 X-Google-Smtp-Source: AGs4zMYHZJL8x29ugNDiR3jxWJWHSLIkw5Ut071cN1Ag3dFxmMzNWQ8kV/hMUWMnA25IvoU4uHZwmw== To: Srinivas Kandagatla From: Heiner Kallweit Cc: Linux Kernel Mailing List Subject: [PATCH] nvmem: core: switch to device_property_present for reading property "read-only" Message-ID: <02db961d-4293-8d67-431f-5bbfc97acc84@gmail.com> Date: Sat, 25 Nov 2017 12:56:55 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Switch to more generic device_property_present to consider also non-DT properties. Signed-off-by: Heiner Kallweit --- drivers/nvmem/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 5a5cefd12..ba0e3b453 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -444,7 +444,6 @@ static int nvmem_setup_compat(struct nvmem_device *nvmem, struct nvmem_device *nvmem_register(const struct nvmem_config *config) { struct nvmem_device *nvmem; - struct device_node *np; int rval; if (!config->dev) @@ -473,13 +472,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->priv = config->priv; nvmem->reg_read = config->reg_read; nvmem->reg_write = config->reg_write; - np = config->dev->of_node; - nvmem->dev.of_node = np; + nvmem->dev.of_node = config->dev->of_node; dev_set_name(&nvmem->dev, "%s%d", config->name ? : "nvmem", config->name ? config->id : nvmem->id); - nvmem->read_only = of_property_read_bool(np, "read-only") | + nvmem->read_only = device_property_present(config->dev, "read-only") | config->read_only; if (config->root_only) -- 2.15.0