[PATCH] nvmem: core: change of_property_read_bool to device_property_present in nvmem_register

[Heiner Kallweit]

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 <hkallwe...@gmail.com>
---
 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