mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

soc: realview: 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-2-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>
This commit is contained in:
Sudeep Holla 2020-05-23 18:08:52 +01:00
parent b3a9e3b962
commit 5feebc6564
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/soc/versatile/soc-realview.c
View File

@ -39,45 +39,37 @@ static const char *realview_arch_str(u32 id)
}
}
static ssize_t realview_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", realview_coreid >> 24);
}
static struct device_attribute realview_manf_attr =
__ATTR(manufacturer, S_IRUGO, realview_get_manf, NULL);
static DEVICE_ATTR_RO(manufacturer);
static ssize_t realview_get_board(struct device *dev,
struct device_attribute *attr,
char *buf)
static ssize_t
board_show(struct device *dev, struct device_attribute *attr, char *buf)
{
return sprintf(buf, "HBI-%03x\n", ((realview_coreid >> 16) & 0xfff));
}
static struct device_attribute realview_board_attr =
__ATTR(board, S_IRUGO, realview_get_board, NULL);
static DEVICE_ATTR_RO(board);
static ssize_t realview_get_arch(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", realview_arch_str(realview_coreid));
}
static struct device_attribute realview_arch_attr =
__ATTR(fpga, S_IRUGO, realview_get_arch, NULL);
static DEVICE_ATTR_RO(fpga);
static ssize_t realview_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", (realview_coreid & 0xFF));
}
static struct device_attribute realview_build_attr =
__ATTR(build, S_IRUGO, realview_get_build, NULL);
static DEVICE_ATTR_RO(build);
static int realview_soc_probe(struct platform_device *pdev)
{
@ -112,10 +104,10 @@ static int realview_soc_probe(struct platform_device *pdev)
if (ret)
return -ENODEV;
device_create_file(soc_device_to_device(soc_dev), &realview_manf_attr);
device_create_file(soc_device_to_device(soc_dev), &realview_board_attr);
device_create_file(soc_device_to_device(soc_dev), &realview_arch_attr);
device_create_file(soc_device_to_device(soc_dev), &realview_build_attr);
device_create_file(soc_device_to_device(soc_dev), &dev_attr_manufacturer);
device_create_file(soc_device_to_device(soc_dev), &dev_attr_board);
device_create_file(soc_device_to_device(soc_dev), &dev_attr_fpga);
device_create_file(soc_device_to_device(soc_dev), &dev_attr_build);
dev_info(&pdev->dev, "RealView Syscon Core ID: 0x%08x, HBI-%03x\n",
realview_coreid,