summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/nvmem/core.c23
-rw-r--r--include/linux/nvmem-consumer.h10
2 files changed, 33 insertions, 0 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 53b934bb33..c0f61f453a 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -750,3 +750,26 @@ int nvmem_device_write(struct nvmem_device *nvmem,
return bytes;
}
EXPORT_SYMBOL_GPL(nvmem_device_write);
+
+void *nvmem_cell_get_and_read(struct device_node *np, const char *cell_name,
+ size_t bytes)
+{
+ struct nvmem_cell *cell;
+ void *value;
+ size_t len;
+
+ cell = of_nvmem_cell_get(np, cell_name);
+ if (IS_ERR(cell))
+ return cell;
+
+ value = nvmem_cell_read(cell, &len);
+ if (!IS_ERR(value) && len != bytes) {
+ kfree(value);
+ value = ERR_PTR(-EINVAL);
+ }
+
+ nvmem_cell_put(cell);
+
+ return value;
+}
+EXPORT_SYMBOL_GPL(nvmem_cell_get_and_read);
diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
index 606cadb498..0ec2f05b97 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -32,6 +32,9 @@ struct nvmem_cell_info {
struct nvmem_cell *nvmem_cell_get(struct device_d *dev, const char *name);
void nvmem_cell_put(struct nvmem_cell *cell);
void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len);
+void *nvmem_cell_get_and_read(struct device_node *np, const char *cell_name,
+ size_t bytes);
+
int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len);
/* direct nvmem device read/write interface */
@@ -55,6 +58,13 @@ static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
return ERR_PTR(-ENOSYS);
}
+static inline void *nvmem_cell_get_and_read(struct device_node *np,
+ const char *cell_name,
+ size_t bytes)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
static inline int nvmem_cell_write(struct nvmem_cell *cell,
const char *buf, size_t len)
{