Commit f59dc511 authored by Zhi Li's avatar Zhi Li Committed by Thomas Bogendoerfer
Browse files

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: default avatarZhi Li <lizhi01@loongson.cn>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 17cbb070

drivers/platform/mips/cpu_hwmon.c

+2 −20
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ out: 
static int nr_packages;

static struct device *cpu_hwmon_dev;



static ssize_t get_hwmon_name(struct device *dev,

			struct device_attribute *attr, char *buf);

static SENSOR_DEVICE_ATTR(name, 0444, get_hwmon_name, NULL, 0);

static SENSOR_DEVICE_ATTR(name, 0444, NULL, NULL, 0);



static struct attribute *cpu_hwmon_attributes[] = {

	&sensor_dev_attr_name.dev_attr.attr,
@@ -69,13 +67,6 @@ static struct attribute_group cpu_hwmon_attribute_group = { 
	.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,

			struct device_attribute *attr, char *buf);

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) &

				  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)) {

		ret = PTR_ERR(cpu_hwmon_dev);

		pr_err("hwmon_device_register fail!\n");
@@ -186,13 +177,6 @@ static int __init loongson_hwmon_init(void) 
	nr_packages = loongson_sysconf.nr_cpus /

		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);

	if (ret) {

		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:

	sysfs_remove_group(&cpu_hwmon_dev->kobj,

				&cpu_hwmon_attribute_group);



fail_sysfs_create_group_hwmon:

	hwmon_device_unregister(cpu_hwmon_dev);



fail_hwmon_device_register:

CRA Git | Maintained and supported by SUSTech CRA and CCSE