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>

2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index d5fb93ed04..81693b4c23 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -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);
 
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 791b8ca4bc..c5fdd688cc 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -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;