[8/8] ARM: OMAP2: Use custom soc attribute group instead of device_create_file

Message ID 20200523170859.50003-9-sudeep.holla@arm.com
State New
Headers show
  • Untitled series #37967
Related show

Commit Message

Sudeep Holla May 23, 2020, 5:08 p.m.
Commit c31e73121f4c ("base: soc: Handle custom soc information sysfs
entries") introduced custom soc attribute group in soc_device_attribute
structure but there are no users treewide. While trying to understand
the motivation and tried to use it, it was found lot of existing custom
attributes can moved to use it instead of device_create_file.

Though most of these never remove/cleanup the custom attribute as they
never call soc_device_unregister, using these custom attribute group
eliminate the need for any cleanup as the driver infrastructure will
take care of that.

Let us remove device_create_file and start using the custom attribute
group in soc_device_attribute.

Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
 arch/arm/mach-omap2/id.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 37ac2d103548..1d119b974f5f 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -783,9 +783,15 @@  type_show(struct device *dev, struct device_attribute *attr, char *buf)
 static DEVICE_ATTR_RO(type);
+static struct attribute *omap_soc_attrs[] = {
+	&dev_attr_type.attr,
 void __init omap_soc_device_init(void)
-	struct device *parent;
 	struct soc_device *soc_dev;
 	struct soc_device_attribute *soc_dev_attr;
@@ -796,14 +802,12 @@  void __init omap_soc_device_init(void)
 	soc_dev_attr->machine  = soc_name;
 	soc_dev_attr->family   = omap_get_family();
 	soc_dev_attr->revision = soc_rev;
+	soc_dev_attr->custom_attr_group = omap_soc_groups[0];
 	soc_dev = soc_device_register(soc_dev_attr);
 	if (IS_ERR(soc_dev)) {
-	parent = soc_device_to_device(soc_dev);
-	device_create_file(parent, &dev_attr_type);
 #endif /* CONFIG_SOC_BUS */