Commit 2369cc94 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

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: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 7fd40029

drivers/misc/thinkpad_acpi.c

+7 −1
Original line number Diff line number Diff line
@@ -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);

drivers/misc/thinkpad_acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE