lkml.org 
[lkml]   [2020]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 29/29] soc: realtek: chip: Adopt nvmem_cell_read_u8() helper
Date
Replace the local helper with the newly introduced official one.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
This could be squashed if the new API and this commit were to get merged in
subsequent merge windows or with the help of a topic branch.

v2: New

drivers/soc/realtek/chip.c | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/drivers/soc/realtek/chip.c b/drivers/soc/realtek/chip.c
index bed028ce1b16..46e0d9063b5d 100644
--- a/drivers/soc/realtek/chip.c
+++ b/drivers/soc/realtek/chip.c
@@ -79,33 +79,6 @@ struct dhc_soc {
const char *codename;
};

-static int dhc_efuse_read_u8(struct device *dev, const char *cell_id, u8 *val)
-{
- struct nvmem_cell *cell;
- void *buf;
- size_t len;
-
- cell = nvmem_cell_get(dev, cell_id);
- if (IS_ERR(cell))
- return PTR_ERR(cell);
-
- buf = nvmem_cell_read(cell, &len);
- if (IS_ERR(buf)) {
- nvmem_cell_put(cell);
- return PTR_ERR(buf);
- }
- if (len != sizeof(*val)) {
- kfree(buf);
- nvmem_cell_put(cell);
- return -EINVAL;
- }
- memcpy(val, buf, 1);
- kfree(buf);
- nvmem_cell_put(cell);
-
- return 0;
-}
-
static const char *default_name(struct device *dev, const struct dhc_soc *s)
{
return s->family;
@@ -118,7 +91,7 @@ static const char *rtd1295_name(struct device *dev, const struct dhc_soc *s)
int ret;
u8 b;

- ret = dhc_efuse_read_u8(dev, "efuse_package_id", &b);
+ ret = nvmem_cell_read_u8(dev, "efuse_package_id", &b);
if (ret == -EPROBE_DEFER)
return ERR_PTR(ret);
else if (ret)
--
2.26.2
\
 
 \ /
  Last update: 2020-06-23 04:53    [W:0.202 / U:2.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site