From 208b5899a0317c22d2eeaa25e98109dae8ec9703 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Sat, 23 May 2020 18:08:56 +0100 Subject: soc: ux500: Switch to use DEVICE_ATTR_RO() 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 Reviewed-by: Greg Kroah-Hartman Reviewed-by: Linus Walleij Signed-off-by: Sudeep Holla --- drivers/soc/ux500/ux500-soc-id.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'drivers/soc/ux500') diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c index d64feeb51a40..55ceb67e066b 100644 --- a/drivers/soc/ux500/ux500-soc-id.c +++ b/drivers/soc/ux500/ux500-soc-id.c @@ -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; } -- cgit v1.2.3