hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIPS: Loongson: Fix boot warning about hwmon_device_register() 

Replace hwmon_device_register() with hwmon_device_register_with_info()
to fix the following boot warning :

[    9.029924] Loongson Hwmon Enter...
[    9.106850] (NULL device *): hwmon_device_register() is deprecated. Please convert the driver to use hwmon_device_register_with_info().

Signed-off-by: Zhi Li <lizhi01@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Zhi Li 2020-07-09 11:55:21 +08:00 committed by Thomas Bogendoerfer
parent 17cbb0702e
commit f59dc51191
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/platform/mips/cpu_hwmon.c
View File

@ -55,9 +55,7 @@ out:
static int nr_packages; static int nr_packages;
static struct device *cpu_hwmon_dev; static struct device *cpu_hwmon_dev;
static ssize_t get_hwmon_name(struct device *dev, static SENSOR_DEVICE_ATTR(name, 0444, NULL, NULL, 0);
struct device_attribute *attr, char *buf);
static SENSOR_DEVICE_ATTR(name, 0444, get_hwmon_name, NULL, 0);
static struct attribute *cpu_hwmon_attributes[] = { static struct attribute *cpu_hwmon_attributes[] = {
&sensor_dev_attr_name.dev_attr.attr, &sensor_dev_attr_name.dev_attr.attr,
@ -69,13 +67,6 @@ static struct attribute_group cpu_hwmon_attribute_group = {
.attrs = cpu_hwmon_attributes, .attrs = cpu_hwmon_attributes,
}; };
/* Hwmon device get name */
static ssize_t get_hwmon_name(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "cpu-hwmon\n");
}
static ssize_t get_cpu_temp(struct device *dev, static ssize_t get_cpu_temp(struct device *dev,
struct device_attribute *attr, char *buf); struct device_attribute *attr, char *buf);
static ssize_t cpu_temp_label(struct device *dev, static ssize_t cpu_temp_label(struct device *dev,
@ -176,7 +167,7 @@ static int __init loongson_hwmon_init(void)
csr_temp_enable = csr_readl(LOONGSON_CSR_FEATURES) & csr_temp_enable = csr_readl(LOONGSON_CSR_FEATURES) &
LOONGSON_CSRF_TEMP; LOONGSON_CSRF_TEMP;
cpu_hwmon_dev = hwmon_device_register(NULL); cpu_hwmon_dev = hwmon_device_register_with_info(NULL, "cpu_hwmon", NULL, NULL, NULL);
if (IS_ERR(cpu_hwmon_dev)) { if (IS_ERR(cpu_hwmon_dev)) {
ret = PTR_ERR(cpu_hwmon_dev); ret = PTR_ERR(cpu_hwmon_dev);
pr_err("hwmon_device_register fail!\n"); pr_err("hwmon_device_register fail!\n");
@ -186,13 +177,6 @@ static int __init loongson_hwmon_init(void)
nr_packages = loongson_sysconf.nr_cpus / nr_packages = loongson_sysconf.nr_cpus /
loongson_sysconf.cores_per_package; loongson_sysconf.cores_per_package;
ret = sysfs_create_group(&cpu_hwmon_dev->kobj,
&cpu_hwmon_attribute_group);
if (ret) {
pr_err("fail to create loongson hwmon!\n");
goto fail_sysfs_create_group_hwmon;
}
ret = create_sysfs_cputemp_files(&cpu_hwmon_dev->kobj); ret = create_sysfs_cputemp_files(&cpu_hwmon_dev->kobj);
if (ret) { if (ret) {
pr_err("fail to create cpu temperature interface!\n"); pr_err("fail to create cpu temperature interface!\n");
@ -207,8 +191,6 @@ static int __init loongson_hwmon_init(void)
fail_create_sysfs_cputemp_files: fail_create_sysfs_cputemp_files:
sysfs_remove_group(&cpu_hwmon_dev->kobj, sysfs_remove_group(&cpu_hwmon_dev->kobj,
&cpu_hwmon_attribute_group); &cpu_hwmon_attribute_group);
fail_sysfs_create_group_hwmon:
hwmon_device_unregister(cpu_hwmon_dev); hwmon_device_unregister(cpu_hwmon_dev);
fail_hwmon_device_register: fail_hwmon_device_register: