]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
soc: ux500: Switch to use DEVICE_ATTR_RO()
authorSudeep Holla <sudeep.holla@arm.com>
Sat, 23 May 2020 17:08:56 +0000 (18:08 +0100)
committerSudeep Holla <sudeep.holla@arm.com>
Mon, 6 Jul 2020 08:48:06 +0000 (09:48 +0100)
Move device attributes to DEVICE_ATTR_RO() as that would make things
a lot more "obvious" what is happening over the existing __ATTR usage.

Link: https://lore.kernel.org/r/20200523170859.50003-6-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>
drivers/soc/ux500/ux500-soc-id.c

index d64feeb51a4064ae1cb52f50797cbcacceeb9112..55ceb67e066b2e3ef62c85087d7489f97bd0443c 100644 (file)
@@ -146,9 +146,8 @@ static const char * __init ux500_get_revision(void)
        return kasprintf(GFP_KERNEL, "%s", "Unknown");
 }
 
-static ssize_t ux500_get_process(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t
+process_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        if (dbx500_id.process == 0x00)
                return sprintf(buf, "Standard\n");
@@ -156,6 +155,8 @@ static ssize_t ux500_get_process(struct device *dev,
        return sprintf(buf, "%02xnm\n", dbx500_id.process);
 }
 
+static DEVICE_ATTR_RO(process);
+
 static const char *db8500_read_soc_id(struct device_node *backupram)
 {
        void __iomem *base;
@@ -186,9 +187,6 @@ static void __init soc_info_populate(struct soc_device_attribute *soc_dev_attr,
        soc_dev_attr->revision = ux500_get_revision();
 }
 
-static const struct device_attribute ux500_soc_attr =
-       __ATTR(process,  S_IRUGO, ux500_get_process,  NULL);
-
 static int __init ux500_soc_device_init(void)
 {
        struct device *parent;
@@ -218,7 +216,7 @@ static int __init ux500_soc_device_init(void)
        }
 
        parent = soc_device_to_device(soc_dev);
-       device_create_file(parent, &ux500_soc_attr);
+       device_create_file(parent, &dev_attr_process);
 
        return 0;
 }