[PATCH] nvmem: core: switch to device_property_present for reading property "read-only"

[PATCH] nvmem: core: switch to device_property_present for reading property "read-only"

[Heiner Kallweit]

Switch to more generic device_property_present to consider also non-DT
properties.

Signed-off-by: Heiner Kallweit <hkallweit1@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 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

Re: [PATCH] nvmem: core: switch to device_property_present for reading property "read-only"

[Srinivas Kandagatla]

Thanks for the patch,

On 25/11/17 11:56, Heiner Kallweit wrote:
> Switch to more generic device_property_present to consider also non-DT
> properties.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@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

It looks good for me, I will queue it up!

> 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)
>