From 53d421d29c052baa2c3f8d861781adc5cbcebe57 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Sat, 23 May 2020 18:08:58 +0100 Subject: [PATCH] ARM: OMAP2: 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-8-sudeep.holla@arm.com Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org Reviewed-by: Greg Kroah-Hartman Acked-by: Tony Lindgren Signed-off-by: Sudeep Holla --- arch/arm/mach-omap2/id.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 188ea52..37ac2d1 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -775,15 +775,13 @@ static const char * __init omap_get_family(void) return kasprintf(GFP_KERNEL, "Unknown"); } -static ssize_t omap_get_type(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t +type_show(struct device *dev, struct device_attribute *attr, char *buf) { return sprintf(buf, "%s\n", omap_types[omap_type()]); } -static struct device_attribute omap_soc_attr = - __ATTR(type, S_IRUGO, omap_get_type, NULL); +static DEVICE_ATTR_RO(type); void __init omap_soc_device_init(void) { @@ -806,6 +804,6 @@ void __init omap_soc_device_init(void) } parent = soc_device_to_device(soc_dev); - device_create_file(parent, &omap_soc_attr); + device_create_file(parent, &dev_attr_type); } #endif /* CONFIG_SOC_BUS */ -- 2.7.4