hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heiner Kallweit 2017-12-15 14:06:06 +00:00 committed by Greg Kroah-Hartman
parent 99897efd5a
commit fc2f997035
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvmem/core.c
View File

@ -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_register(const struct nvmem_config *config)
{ {
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct device_node *np;
int rval; int rval;
if (!config->dev) if (!config->dev)
@ -473,13 +472,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
nvmem->priv = config->priv; nvmem->priv = config->priv;
nvmem->reg_read = config->reg_read; nvmem->reg_read = config->reg_read;
nvmem->reg_write = config->reg_write; nvmem->reg_write = config->reg_write;
np = config->dev->of_node; nvmem->dev.of_node = config->dev->of_node;
nvmem->dev.of_node = np;
dev_set_name(&nvmem->dev, "%s%d", dev_set_name(&nvmem->dev, "%s%d",
config->name ? : "nvmem", config->name ? : "nvmem",
config->name ? config->id : nvmem->id); 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; config->read_only;
if (config->root_only) if (config->root_only)