|
|
@@ -567,8 +567,7 @@ struct it87_data {
|
|
|
};
|
|
|
|
|
|
|
|
|
-extern struct kobject *vfiec_kobj;
|
|
|
-static struct kobject *fan_kobj = NULL;
|
|
|
+extern struct kobject *hwmon_kobj;
|
|
|
struct device *dev_it87 = NULL;
|
|
|
|
|
|
|
|
|
@@ -4311,30 +4310,20 @@ int fan_init(void)
|
|
|
err = -ENODEV;
|
|
|
goto exit_unregister;
|
|
|
}
|
|
|
- fan_kobj = kobject_create_and_add("hwmon", vfiec_kobj);
|
|
|
- if (!fan_kobj)
|
|
|
- {
|
|
|
- err = -ENOMEM;
|
|
|
- goto exit_dev_unregister;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- printk(KERN_INFO "Faifan to create sysfs node\n");
|
|
|
- }
|
|
|
|
|
|
- err = sysfs_create_group(fan_kobj, &fan_attr_group);
|
|
|
+ err = sysfs_create_group(hwmon_kobj, &fan_attr_group);
|
|
|
if (err)
|
|
|
{
|
|
|
pr_err("Faifan to create sysfs group: %d\n", err);
|
|
|
- goto free_fan_kobj;
|
|
|
+ goto free_hwmon_kobj;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
printk(KERN_INFO "Create sysfs group success\n");
|
|
|
}
|
|
|
return 0;
|
|
|
-free_fan_kobj:
|
|
|
- kobject_put(fan_kobj);
|
|
|
+free_hwmon_kobj:
|
|
|
+ kobject_put(hwmon_kobj);
|
|
|
exit_dev_unregister:
|
|
|
/* NULL check handled by platform_device_unregister */
|
|
|
platform_device_unregister(it87_pdev[0]);
|
|
|
@@ -4349,8 +4338,8 @@ void fan_exit(void)
|
|
|
platform_device_unregister(it87_pdev[1]);
|
|
|
platform_device_unregister(it87_pdev[0]);
|
|
|
platform_driver_unregister(&it87_driver);
|
|
|
- sysfs_remove_group(fan_kobj, &fan_attr_group);
|
|
|
- kobject_put(fan_kobj);
|
|
|
+ sysfs_remove_group(hwmon_kobj, &fan_attr_group);
|
|
|
+ kobject_put(hwmon_kobj);
|
|
|
}
|
|
|
|
|
|
module_param(update_vbat, bool, 0);
|