Skip to contentSkip to conversation

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

PATCH In review Heiner Kallweit 2 participants 2 messages Nov 25, 2017 NVMEM framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvmem: core: switch to device_property_present for reading property "read-only"

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

---
 drivers/nvmem/core.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/nvmem/core.c +2 -4
index 5a5cefd12..ba0e3b453 100644
@@ -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)
Signature · 1 line
2.15.0
#1 lore raw

Thanks for the patch,

drivers/nvmem/core.c

Quoted 9 lines · Heiner Kallweit

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

---
  drivers/nvmem/core.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/nvmem/core.c +0 -0

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

Quoted 28 lines

index 5a5cefd12..ba0e3b453 100644

drivers/nvmem/core.c +2 -4
@@ -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)