soc: integrator: Use custom soc attribute group instead of device_create_file

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.

Link: https://lore.kernel.org/r/20200523170859.50003-5-sudeep.holla@arm.com
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/soc/versatile/soc-integrator.c b/drivers/soc/versatile/soc-integrator.c
index 8ba98b3b4e8e388374381a119ce6e76d9bf2546a..7dcf77ccd31ec0a1c594c65f6e668a8a49e1d319 100644 (file)
--- a/drivers/soc/versatile/soc-integrator.c
+++ b/drivers/soc/versatile/soc-integrator.c
@@ -88,6 +88,16 @@ build_show(struct device *dev, struct device_attribute *attr, char *buf)
 
 static DEVICE_ATTR_RO(build);
 
+static struct attribute *integrator_attrs[] = {
+       &dev_attr_manufacturer.attr,
+       &dev_attr_arch.attr,
+       &dev_attr_fpga.attr,
+       &dev_attr_build.attr,
+       NULL
+};
+
+ATTRIBUTE_GROUPS(integrator);
+
 static int __init integrator_soc_init(void)
 {
        static struct regmap *syscon_regmap;
@@ -119,6 +129,7 @@ static int __init integrator_soc_init(void)
        soc_dev_attr->soc_id = "Integrator";
        soc_dev_attr->machine = "Integrator";
        soc_dev_attr->family = "Versatile";
+       soc_dev_attr->custom_attr_group = integrator_groups[0];
        soc_dev = soc_device_register(soc_dev_attr);
        if (IS_ERR(soc_dev)) {
                kfree(soc_dev_attr);
@@ -126,11 +137,6 @@ static int __init integrator_soc_init(void)
        }
        dev = soc_device_to_device(soc_dev);
 
-       device_create_file(dev, &dev_attr_manufacturer);
-       device_create_file(dev, &dev_attr_arch);
-       device_create_file(dev, &dev_attr_fpga);
-       device_create_file(dev, &dev_attr_build);
-
        dev_info(dev, "Detected ARM core module:\n");
        dev_info(dev, "    Manufacturer: %02x\n", (val >> 24));
        dev_info(dev, "    Architecture: %s\n", integrator_arch_str(val));