mirror of
https://github.com/adulau/aha.git
synced 2025-01-01 13:46:24 +00:00
ACPI: thinkpad-acpi: duplicate driver attributes to new hwmon pdrv
Thinkpad-acpi has some driver attributes (debug level, sysfs interface version, etc) that also belong to the new hwmon driver. Duplicate them there. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
7fd4002979
commit
2369cc9492
2 changed files with 8 additions and 1 deletions
|
@ -4803,12 +4803,16 @@ static int __init thinkpad_acpi_module_init(void)
|
|||
tp_features.sensors_pdrv_registered = 1;
|
||||
|
||||
ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
|
||||
if (!ret) {
|
||||
tp_features.platform_drv_attrs_registered = 1;
|
||||
ret = tpacpi_create_driver_attributes(&tpacpi_hwmon_pdriver.driver);
|
||||
}
|
||||
if (ret) {
|
||||
printk(IBM_ERR "unable to create sysfs driver attributes\n");
|
||||
thinkpad_acpi_module_exit();
|
||||
return ret;
|
||||
}
|
||||
tp_features.platform_drv_attrs_registered = 1;
|
||||
tp_features.sensors_pdrv_attrs_registered = 1;
|
||||
|
||||
|
||||
/* Device initialization */
|
||||
|
@ -4919,6 +4923,8 @@ static void thinkpad_acpi_module_exit(void)
|
|||
if (tpacpi_pdev)
|
||||
platform_device_unregister(tpacpi_pdev);
|
||||
|
||||
if (tp_features.sensors_pdrv_attrs_registered)
|
||||
tpacpi_remove_driver_attributes(&tpacpi_hwmon_pdriver.driver);
|
||||
if (tp_features.platform_drv_attrs_registered)
|
||||
tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
|
||||
|
||||
|
|
|
@ -252,6 +252,7 @@ static struct {
|
|||
u32 platform_drv_registered:1;
|
||||
u32 platform_drv_attrs_registered:1;
|
||||
u32 sensors_pdrv_registered:1;
|
||||
u32 sensors_pdrv_attrs_registered:1;
|
||||
u32 sensors_pdev_attrs_registered:1;
|
||||
} tp_features;
|
||||
|
||||
|
|
Loading…
Reference in a new issue