2020-08-20 13:41:39

by Tian Tao

Subject: [PATCH] nvmem: core: Use kobj_to_dev() instead of container_of()

Use kobj_to_dev() instead of container_of()

Signed-off-by: Tian Tao <[email protected]>
---
drivers/nvmem/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 6cd3edb..7641e56 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -128,7 +128,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
if (attr->private)
dev = attr->private;
else
- dev = container_of(kobj, struct device, kobj);
+ dev = kobj_to_dev(kobj);
nvmem = to_nvmem_device(dev);

/* Stop the user from reading */
@@ -168,7 +168,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
if (attr->private)
dev = attr->private;
else
- dev = container_of(kobj, struct device, kobj);
+ dev = kobj_to_dev(kobj);
nvmem = to_nvmem_device(dev);

/* Stop the user from writing */
@@ -219,7 +219,7 @@ static umode_t nvmem_bin_attr_get_umode(struct nvmem_device *nvmem)
static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
struct bin_attribute *attr, int i)
{
- struct device *dev = container_of(kobj, struct device, kobj);
+ struct device *dev = kobj_to_dev(kobj);
struct nvmem_device *nvmem = to_nvmem_device(dev);

return nvmem_bin_attr_get_umode(nvmem);
--
2.7.4

2020-09-04 12:38:40

by Srinivas Kandagatla

Subject: Re: [PATCH] nvmem: core: Use kobj_to_dev() instead of container_of()

On 20/08/2020 10:28, Tian Tao wrote:
> Use kobj_to_dev() instead of container_of()
>
> Signed-off-by: Tian Tao <[email protected]>

Applied thanks,

--srini
> ---
> drivers/nvmem/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index 6cd3edb..7641e56 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -128,7 +128,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
> if (attr->private)
> dev = attr->private;
> else
> - dev = container_of(kobj, struct device, kobj);
> + dev = kobj_to_dev(kobj);
> nvmem = to_nvmem_device(dev);
>
> /* Stop the user from reading */
> @@ -168,7 +168,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
> if (attr->private)
> dev = attr->private;
> else
> - dev = container_of(kobj, struct device, kobj);
> + dev = kobj_to_dev(kobj);
> nvmem = to_nvmem_device(dev);
>
> /* Stop the user from writing */
> @@ -219,7 +219,7 @@ static umode_t nvmem_bin_attr_get_umode(struct nvmem_device *nvmem)
> static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
> struct bin_attribute *attr, int i)
> {
> - struct device *dev = container_of(kobj, struct device, kobj);
> + struct device *dev = kobj_to_dev(kobj);
> struct nvmem_device *nvmem = to_nvmem_device(dev);
>
> return nvmem_bin_attr_get_umode(nvmem);
>