evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACPI/int340x_thermal: enumerate INT340X devices even if they're not in _ART/_TRT

Browse source 
For some INT340X thermal devices, even if they are not referred in
_TRT/_ART table, they still can be used by userspace for thermal control.
Thus change the code to enumerated all the INT340X devices,
no matter if they're referred in _TRT/_ART or not.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
This commit is contained in:
Zhang Rui 2015-01-04 14:24:23 +08:00
parent 693a30b8f1
commit 48628e4015
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/int340x_thermal.c
View file

@ -14,9 +14,8 @@
#include "internal.h" #include "internal.h"
#define DO_ENUMERATION 0x01
static const struct acpi_device_id int340x_thermal_device_ids[] = { static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INT3400", DO_ENUMERATION }, {"INT3400"},
{"INT3401"}, {"INT3401"},
{"INT3402"}, {"INT3402"},
{"INT3403"}, {"INT3403"},
@ -34,7 +33,6 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev,
const struct acpi_device_id *id) const struct acpi_device_id *id)
{ {
#if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE) #if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE)
if (id->driver_data == DO_ENUMERATION)
acpi_create_platform_device(adev); acpi_create_platform_device(adev);
#endif #endif
return 1; return 1;

16
drivers/thermal/int340x_thermal/acpi_thermal_rel.c
View file

@ -119,15 +119,11 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
continue; continue;
result = acpi_bus_get_device(trt->source, &adev); result = acpi_bus_get_device(trt->source, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
result = acpi_bus_get_device(trt->target, &adev); result = acpi_bus_get_device(trt->target, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get target ACPI device\n"); pr_warn("Failed to get target ACPI device\n");
} }
@ -206,16 +202,12 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
if (art->source) { if (art->source) {
result = acpi_bus_get_device(art->source, &adev); result = acpi_bus_get_device(art->source, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
} }
if (art->target) { if (art->target) {
result = acpi_bus_get_device(art->target, &adev); result = acpi_bus_get_device(art->target, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
} }
} }