Commit 00ab6e97 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Greg Kroah-Hartman
Browse files

nvmem: core: calculate bin_attribute size through bin_size() 



Stop abusing the is_bin_visible() callback to calculate the attribute
size. Instead use the new, dedicated bin_size() one.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarKrzysztof Wilczyński <kw@linux.com>
Link: https://lore.kernel.org/r/20241103-sysfs-const-bin_attr-v2-4-71110628844c@weissschuh.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1ab720e

drivers/nvmem/core.c

+11 −2
Original line number Diff line number Diff line
@@ -303,11 +303,19 @@ static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj, 
	struct device *dev = kobj_to_dev(kobj);

	struct nvmem_device *nvmem = to_nvmem_device(dev);



	attr->size = nvmem->size;



	return nvmem_bin_attr_get_umode(nvmem);

}



static size_t nvmem_bin_attr_size(struct kobject *kobj,

				  const struct bin_attribute *attr,

				  int i)

{

	struct device *dev = kobj_to_dev(kobj);

	struct nvmem_device *nvmem = to_nvmem_device(dev);



	return nvmem->size;

}



static umode_t nvmem_attr_is_visible(struct kobject *kobj,

				     struct attribute *attr, int i)

{
@@ -383,6 +391,7 @@ static const struct attribute_group nvmem_bin_group = { 
	.bin_attrs	= nvmem_bin_attributes,

	.attrs		= nvmem_attrs,

	.is_bin_visible = nvmem_bin_attr_is_visible,

	.bin_size	= nvmem_bin_attr_size,

	.is_visible	= nvmem_attr_is_visible,

};