mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
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:
parent
b3a9e3b962
commit
5feebc6564
1 changed files with 16 additions and 24 deletions
|
@ -39,45 +39,37 @@ static const char *realview_arch_str(u32 id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t realview_get_manf(struct device *dev,
|
static ssize_t
|
||||||
struct device_attribute *attr,
|
manufacturer_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
return sprintf(buf, "%02x\n", realview_coreid >> 24);
|
return sprintf(buf, "%02x\n", realview_coreid >> 24);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute realview_manf_attr =
|
static DEVICE_ATTR_RO(manufacturer);
|
||||||
__ATTR(manufacturer, S_IRUGO, realview_get_manf, NULL);
|
|
||||||
|
|
||||||
static ssize_t realview_get_board(struct device *dev,
|
static ssize_t
|
||||||
struct device_attribute *attr,
|
board_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
return sprintf(buf, "HBI-%03x\n", ((realview_coreid >> 16) & 0xfff));
|
return sprintf(buf, "HBI-%03x\n", ((realview_coreid >> 16) & 0xfff));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute realview_board_attr =
|
static DEVICE_ATTR_RO(board);
|
||||||
__ATTR(board, S_IRUGO, realview_get_board, NULL);
|
|
||||||
|
|
||||||
static ssize_t realview_get_arch(struct device *dev,
|
static ssize_t
|
||||||
struct device_attribute *attr,
|
fpga_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
return sprintf(buf, "%s\n", realview_arch_str(realview_coreid));
|
return sprintf(buf, "%s\n", realview_arch_str(realview_coreid));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute realview_arch_attr =
|
static DEVICE_ATTR_RO(fpga);
|
||||||
__ATTR(fpga, S_IRUGO, realview_get_arch, NULL);
|
|
||||||
|
|
||||||
static ssize_t realview_get_build(struct device *dev,
|
static ssize_t
|
||||||
struct device_attribute *attr,
|
build_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
return sprintf(buf, "%02x\n", (realview_coreid & 0xFF));
|
return sprintf(buf, "%02x\n", (realview_coreid & 0xFF));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute realview_build_attr =
|
static DEVICE_ATTR_RO(build);
|
||||||
__ATTR(build, S_IRUGO, realview_get_build, NULL);
|
|
||||||
|
|
||||||
static int realview_soc_probe(struct platform_device *pdev)
|
static int realview_soc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
@ -112,10 +104,10 @@ static int realview_soc_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
device_create_file(soc_device_to_device(soc_dev), &realview_manf_attr);
|
device_create_file(soc_device_to_device(soc_dev), &dev_attr_manufacturer);
|
||||||
device_create_file(soc_device_to_device(soc_dev), &realview_board_attr);
|
device_create_file(soc_device_to_device(soc_dev), &dev_attr_board);
|
||||||
device_create_file(soc_device_to_device(soc_dev), &realview_arch_attr);
|
device_create_file(soc_device_to_device(soc_dev), &dev_attr_fpga);
|
||||||
device_create_file(soc_device_to_device(soc_dev), &realview_build_attr);
|
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",
|
dev_info(&pdev->dev, "RealView Syscon Core ID: 0x%08x, HBI-%03x\n",
|
||||||
realview_coreid,
|
realview_coreid,
|
||||||
|
|
Loading…
Reference in a new issue