From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 3/8] soc: integrator: Switch to use DEVICE_ATTR_RO()
Date: Sat, 23 May 2020 18:08:54 +0100 [thread overview]
Message-ID: <20200523170859.50003-4-sudeep.holla@arm.com> (raw)
In-Reply-To: <20200523170859.50003-1-sudeep.holla@arm.com>
Move device attributes to DEVICE_ATTR_RO() as that would make things
a lot more "obvious" what is happening over the existing __ATTR usage.
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/soc/versatile/soc-integrator.c | 40 +++++++++++---------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/drivers/soc/versatile/soc-integrator.c b/drivers/soc/versatile/soc-integrator.c
index ae13fa2aa582..8ba98b3b4e8e 100644
--- a/drivers/soc/versatile/soc-integrator.c
+++ b/drivers/soc/versatile/soc-integrator.c
@@ -56,45 +56,37 @@ static const char *integrator_fpga_str(u32 id)
}
}
-static ssize_t integrator_get_manf(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t
+manufacturer_show(struct device *dev, struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%02x\n", integrator_coreid >> 24);
}
-static struct device_attribute integrator_manf_attr =
- __ATTR(manufacturer, S_IRUGO, integrator_get_manf, NULL);
+static DEVICE_ATTR_RO(manufacturer);
-static ssize_t integrator_get_arch(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t
+arch_show(struct device *dev, struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%s\n", integrator_arch_str(integrator_coreid));
}
-static struct device_attribute integrator_arch_attr =
- __ATTR(arch, S_IRUGO, integrator_get_arch, NULL);
+static DEVICE_ATTR_RO(arch);
-static ssize_t integrator_get_fpga(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t
+fpga_show(struct device *dev, struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%s\n", integrator_fpga_str(integrator_coreid));
}
-static struct device_attribute integrator_fpga_attr =
- __ATTR(fpga, S_IRUGO, integrator_get_fpga, NULL);
+static DEVICE_ATTR_RO(fpga);
-static ssize_t integrator_get_build(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t
+build_show(struct device *dev, struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%02x\n", (integrator_coreid >> 4) & 0xFF);
}
-static struct device_attribute integrator_build_attr =
- __ATTR(build, S_IRUGO, integrator_get_build, NULL);
+static DEVICE_ATTR_RO(build);
static int __init integrator_soc_init(void)
{
@@ -134,10 +126,10 @@ static int __init integrator_soc_init(void)
}
dev = soc_device_to_device(soc_dev);
- device_create_file(dev, &integrator_manf_attr);
- device_create_file(dev, &integrator_arch_attr);
- device_create_file(dev, &integrator_fpga_attr);
- device_create_file(dev, &integrator_build_attr);
+ 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));
--
2.17.1
next prev parent reply other threads:[~2020-05-23 17:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-23 17:08 [PATCH 0/8] soc: Use custom soc attribute group and DEVICE_ATTR_RO Sudeep Holla
2020-05-23 17:08 ` [PATCH 1/8] soc: realview: Switch to use DEVICE_ATTR_RO() Sudeep Holla
2020-05-25 11:44 ` Linus Walleij
2020-05-23 17:08 ` [PATCH 2/8] soc: realview: Use custom soc attribute group instead of device_create_file Sudeep Holla
2020-05-25 11:45 ` Linus Walleij
2020-05-23 17:08 ` Sudeep Holla [this message]
2020-05-25 11:45 ` [PATCH 3/8] soc: integrator: Switch to use DEVICE_ATTR_RO() Linus Walleij
2020-05-23 17:08 ` [PATCH 4/8] soc: integrator: Use custom soc attribute group instead of device_create_file Sudeep Holla
2020-05-25 11:46 ` Linus Walleij
2020-05-23 17:08 ` [PATCH 5/8] soc: ux500: Switch to use DEVICE_ATTR_RO() Sudeep Holla
2020-05-25 11:46 ` Linus Walleij
2020-05-23 17:08 ` [PATCH 6/8] soc: ux500: Use custom soc attribute group instead of device_create_file Sudeep Holla
2020-05-25 11:46 ` Linus Walleij
2020-05-23 17:08 ` [PATCH 7/8] ARM: OMAP2: Switch to use DEVICE_ATTR_RO() Sudeep Holla
2020-05-29 17:47 ` Tony Lindgren
2020-05-23 17:08 ` [PATCH 8/8] ARM: OMAP2: Use custom soc attribute group instead of device_create_file Sudeep Holla
2020-05-29 18:01 ` Tony Lindgren
2020-05-27 9:03 ` [PATCH 0/8] soc: Use custom soc attribute group and DEVICE_ATTR_RO Greg Kroah-Hartman
2020-05-27 16:52 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200523170859.50003-4-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).