| Message ID | 1608867065-52320-1-git-send-email-tiantao6@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nvdimm: Switch to using the new API kobj_to_dev() | expand |
On Fri, Dec 25, 2020 at 11:31:05AM +0800, Tian Tao wrote: > fixed the following coccicheck: > drivers/nvdimm//namespace_devs.c:1626:60-61: WARNING opportunity for > kobj_to_dev(). > drivers/nvdimm//region_devs.c:762:60-61: WARNING opportunity for > kobj_to_dev(). > > since container_of(kobj, typeof(*dev), kobj) and > container_of(kobj, struct device, kobj) are the same, so also > replace container_of(kobj, typeof(*dev), kobj) with the new kobj_to_dev. > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> > --- > drivers/nvdimm/bus.c | 2 +- > drivers/nvdimm/core.c | 2 +- > drivers/nvdimm/dimm_devs.c | 4 ++-- > drivers/nvdimm/namespace_devs.c | 2 +- > drivers/nvdimm/region_devs.c | 4 ++-- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c > index 2304c61..cf2b70b 100644 > --- a/drivers/nvdimm/bus.c > +++ b/drivers/nvdimm/bus.c > @@ -713,7 +713,7 @@ static struct attribute *nd_numa_attributes[] = { > static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a, > int n) > { > - struct device *dev = container_of(kobj, typeof(*dev), kobj); > + struct device *dev = kobj_to_dev(kobj); > > if (!IS_ENABLED(CONFIG_NUMA)) > return 0; > diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c > index 7de592d..431e47a 100644 > --- a/drivers/nvdimm/core.c > +++ b/drivers/nvdimm/core.c > @@ -503,7 +503,7 @@ static DEVICE_ATTR_ADMIN_RW(activate); > > static umode_t nvdimm_bus_firmware_visible(struct kobject *kobj, struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, typeof(*dev), kobj); > + struct device *dev = kobj_to_dev(kobj); > struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev); > struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; > enum nvdimm_fwa_capability cap; > diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c > index b59032e..76ee2c3 100644 > --- a/drivers/nvdimm/dimm_devs.c > +++ b/drivers/nvdimm/dimm_devs.c > @@ -418,7 +418,7 @@ static struct attribute *nvdimm_attributes[] = { > > static umode_t nvdimm_visible(struct kobject *kobj, struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, typeof(*dev), kobj); > + struct device *dev = kobj_to_dev(kobj); > struct nvdimm *nvdimm = to_nvdimm(dev); > > if (a != &dev_attr_security.attr && a != &dev_attr_frozen.attr) > @@ -534,7 +534,7 @@ static struct attribute *nvdimm_firmware_attributes[] = { > > static umode_t nvdimm_firmware_visible(struct kobject *kobj, struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, typeof(*dev), kobj); > + struct device *dev = kobj_to_dev(kobj); > struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); > struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; > struct nvdimm *nvdimm = to_nvdimm(dev); > diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c > index 6da67f4..1d11ca7 100644 > --- a/drivers/nvdimm/namespace_devs.c > +++ b/drivers/nvdimm/namespace_devs.c > @@ -1623,7 +1623,7 @@ static struct attribute *nd_namespace_attributes[] = { > static umode_t namespace_visible(struct kobject *kobj, > struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, struct device, kobj); > + struct device *dev = kobj_to_dev(kobj); > > if (a == &dev_attr_resource.attr && is_namespace_blk(dev)) > return 0; > diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c > index ef23119..92adfaf 100644 > --- a/drivers/nvdimm/region_devs.c > +++ b/drivers/nvdimm/region_devs.c > @@ -644,7 +644,7 @@ static struct attribute *nd_region_attributes[] = { > > static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, typeof(*dev), kobj); > + struct device *dev = kobj_to_dev(kobj); > struct nd_region *nd_region = to_nd_region(dev); > struct nd_interleave_set *nd_set = nd_region->nd_set; > int type = nd_region_to_nstype(nd_region); > @@ -759,7 +759,7 @@ REGION_MAPPING(31); > > static umode_t mapping_visible(struct kobject *kobj, struct attribute *a, int n) > { > - struct device *dev = container_of(kobj, struct device, kobj); > + struct device *dev = kobj_to_dev(kobj); > struct nd_region *nd_region = to_nd_region(dev); > > if (n < nd_region->ndr_mappings) > -- > 2.7.4 >
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 2304c61..cf2b70b 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -713,7 +713,7 @@ static struct attribute *nd_numa_attributes[] = { static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct device *dev = kobj_to_dev(kobj); if (!IS_ENABLED(CONFIG_NUMA)) return 0; diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c index 7de592d..431e47a 100644 --- a/drivers/nvdimm/core.c +++ b/drivers/nvdimm/core.c @@ -503,7 +503,7 @@ static DEVICE_ATTR_ADMIN_RW(activate); static umode_t nvdimm_bus_firmware_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct device *dev = kobj_to_dev(kobj); struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev); struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; enum nvdimm_fwa_capability cap; diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index b59032e..76ee2c3 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -418,7 +418,7 @@ static struct attribute *nvdimm_attributes[] = { static umode_t nvdimm_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct device *dev = kobj_to_dev(kobj); struct nvdimm *nvdimm = to_nvdimm(dev); if (a != &dev_attr_security.attr && a != &dev_attr_frozen.attr) @@ -534,7 +534,7 @@ static struct attribute *nvdimm_firmware_attributes[] = { static umode_t nvdimm_firmware_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct device *dev = kobj_to_dev(kobj); struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; struct nvdimm *nvdimm = to_nvdimm(dev); diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 6da67f4..1d11ca7 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -1623,7 +1623,7 @@ static struct attribute *nd_namespace_attributes[] = { static umode_t namespace_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, struct device, kobj); + struct device *dev = kobj_to_dev(kobj); if (a == &dev_attr_resource.attr && is_namespace_blk(dev)) return 0; diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index ef23119..92adfaf 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -644,7 +644,7 @@ static struct attribute *nd_region_attributes[] = { static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct device *dev = kobj_to_dev(kobj); struct nd_region *nd_region = to_nd_region(dev); struct nd_interleave_set *nd_set = nd_region->nd_set; int type = nd_region_to_nstype(nd_region); @@ -759,7 +759,7 @@ REGION_MAPPING(31); static umode_t mapping_visible(struct kobject *kobj, struct attribute *a, int n) { - struct device *dev = container_of(kobj, struct device, kobj); + struct device *dev = kobj_to_dev(kobj); struct nd_region *nd_region = to_nd_region(dev); if (n < nd_region->ndr_mappings)
fixed the following coccicheck: drivers/nvdimm//namespace_devs.c:1626:60-61: WARNING opportunity for kobj_to_dev(). drivers/nvdimm//region_devs.c:762:60-61: WARNING opportunity for kobj_to_dev(). since container_of(kobj, typeof(*dev), kobj) and container_of(kobj, struct device, kobj) are the same, so also replace container_of(kobj, typeof(*dev), kobj) with the new kobj_to_dev. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> --- drivers/nvdimm/bus.c | 2 +- drivers/nvdimm/core.c | 2 +- drivers/nvdimm/dimm_devs.c | 4 ++-- drivers/nvdimm/namespace_devs.c | 2 +- drivers/nvdimm/region_devs.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)