1 From 2369cc9492a462285f9eec9d2bbfa730cc2ab5ac Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Sun, 23 Sep 2007 11:39:07 -0300
4 Subject: [PATCH 12/23] ACPI: thinkpad-acpi: duplicate driver attributes to new hwmon pdrv
6 Thinkpad-acpi has some driver attributes (debug level, sysfs interface
7 version, etc) that also belong to the new hwmon driver. Duplicate them
10 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
11 Signed-off-by: Len Brown <len.brown@intel.com>
13 drivers/misc/thinkpad_acpi.c | 8 +++++++-
14 drivers/misc/thinkpad_acpi.h | 1 +
15 2 files changed, 8 insertions(+), 1 deletions(-)
17 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
18 index d5fb93e..81693b4 100644
19 --- a/drivers/misc/thinkpad_acpi.c
20 +++ b/drivers/misc/thinkpad_acpi.c
21 @@ -4803,12 +4803,16 @@ static int __init thinkpad_acpi_module_init(void)
22 tp_features.sensors_pdrv_registered = 1;
24 ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
26 + tp_features.platform_drv_attrs_registered = 1;
27 + ret = tpacpi_create_driver_attributes(&tpacpi_hwmon_pdriver.driver);
30 printk(IBM_ERR "unable to create sysfs driver attributes\n");
31 thinkpad_acpi_module_exit();
34 - tp_features.platform_drv_attrs_registered = 1;
35 + tp_features.sensors_pdrv_attrs_registered = 1;
38 /* Device initialization */
39 @@ -4919,6 +4923,8 @@ static void thinkpad_acpi_module_exit(void)
41 platform_device_unregister(tpacpi_pdev);
43 + if (tp_features.sensors_pdrv_attrs_registered)
44 + tpacpi_remove_driver_attributes(&tpacpi_hwmon_pdriver.driver);
45 if (tp_features.platform_drv_attrs_registered)
46 tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
48 diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
49 index 791b8ca..c5fdd68 100644
50 --- a/drivers/misc/thinkpad_acpi.h
51 +++ b/drivers/misc/thinkpad_acpi.h
52 @@ -252,6 +252,7 @@ static struct {
53 u32 platform_drv_registered:1;
54 u32 platform_drv_attrs_registered:1;
55 u32 sensors_pdrv_registered:1;
56 + u32 sensors_pdrv_attrs_registered:1;
57 u32 sensors_pdev_attrs_registered:1;