mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
soc: integrator: 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-4-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
99d50b9b8c
commit
734776eb16
1 changed files with 16 additions and 24 deletions
|
@ -56,45 +56,37 @@ static const char *integrator_fpga_str(u32 id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t integrator_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", integrator_coreid >> 24);
|
return sprintf(buf, "%02x\n", integrator_coreid >> 24);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute integrator_manf_attr =
|
static DEVICE_ATTR_RO(manufacturer);
|
||||||
__ATTR(manufacturer, S_IRUGO, integrator_get_manf, NULL);
|
|
||||||
|
|
||||||
static ssize_t integrator_get_arch(struct device *dev,
|
static ssize_t
|
||||||
struct device_attribute *attr,
|
arch_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
char *buf)
|
|
||||||
{
|
{
|
||||||
return sprintf(buf, "%s\n", integrator_arch_str(integrator_coreid));
|
return sprintf(buf, "%s\n", integrator_arch_str(integrator_coreid));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute integrator_arch_attr =
|
static DEVICE_ATTR_RO(arch);
|
||||||
__ATTR(arch, S_IRUGO, integrator_get_arch, NULL);
|
|
||||||
|
|
||||||
static ssize_t integrator_get_fpga(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", integrator_fpga_str(integrator_coreid));
|
return sprintf(buf, "%s\n", integrator_fpga_str(integrator_coreid));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute integrator_fpga_attr =
|
static DEVICE_ATTR_RO(fpga);
|
||||||
__ATTR(fpga, S_IRUGO, integrator_get_fpga, NULL);
|
|
||||||
|
|
||||||
static ssize_t integrator_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", (integrator_coreid >> 4) & 0xFF);
|
return sprintf(buf, "%02x\n", (integrator_coreid >> 4) & 0xFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device_attribute integrator_build_attr =
|
static DEVICE_ATTR_RO(build);
|
||||||
__ATTR(build, S_IRUGO, integrator_get_build, NULL);
|
|
||||||
|
|
||||||
static int __init integrator_soc_init(void)
|
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);
|
dev = soc_device_to_device(soc_dev);
|
||||||
|
|
||||||
device_create_file(dev, &integrator_manf_attr);
|
device_create_file(dev, &dev_attr_manufacturer);
|
||||||
device_create_file(dev, &integrator_arch_attr);
|
device_create_file(dev, &dev_attr_arch);
|
||||||
device_create_file(dev, &integrator_fpga_attr);
|
device_create_file(dev, &dev_attr_fpga);
|
||||||
device_create_file(dev, &integrator_build_attr);
|
device_create_file(dev, &dev_attr_build);
|
||||||
|
|
||||||
dev_info(dev, "Detected ARM core module:\n");
|
dev_info(dev, "Detected ARM core module:\n");
|
||||||
dev_info(dev, " Manufacturer: %02x\n", (val >> 24));
|
dev_info(dev, " Manufacturer: %02x\n", (val >> 24));
|
||||||
|
|
Loading…
Reference in a new issue