From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbdHTUR7 (ORCPT ); Sun, 20 Aug 2017 16:17:59 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:37940 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753274AbdHTUR5 (ORCPT ); Sun, 20 Aug 2017 16:17:57 -0400 From: Heiner Kallweit Subject: [PATCH] nvmem: core: change of_property_read_bool to device_property_present in nvmem_register To: Srinivas Kandagatla Cc: Linux Kernel Mailing List Message-ID: Date: Sun, 20 Aug 2017 22:17:50 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.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 When checking for property "read-only" it's better to use the more generic device_property_present as in addition to device tree nodes it also covers other node types like ACPI nodes. In addition switch to a logical or. 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 4c492851..2112cbac 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) @@ -471,13 +470,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.14.1