aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/acerhdf.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/platform/x86/acerhdf.c')
-rw-r--r--drivers/platform/x86/acerhdf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 1ef02daddb60..460fa6708bfc 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -346,8 +346,7 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
346 * as late as the polling interval is since we can't do that in the respective 346 * as late as the polling interval is since we can't do that in the respective
347 * accessors of the module parameters. 347 * accessors of the module parameters.
348 */ 348 */
349static int acerhdf_get_ec_temp(struct thermal_zone_device *thermal, 349static int acerhdf_get_ec_temp(struct thermal_zone_device *thermal, int *t)
350 unsigned long *t)
351{ 350{
352 int temp, err = 0; 351 int temp, err = 0;
353 352
@@ -453,7 +452,7 @@ static int acerhdf_get_trip_type(struct thermal_zone_device *thermal, int trip,
453} 452}
454 453
455static int acerhdf_get_trip_hyst(struct thermal_zone_device *thermal, int trip, 454static int acerhdf_get_trip_hyst(struct thermal_zone_device *thermal, int trip,
456 unsigned long *temp) 455 int *temp)
457{ 456{
458 if (trip != 0) 457 if (trip != 0)
459 return -EINVAL; 458 return -EINVAL;
@@ -464,7 +463,7 @@ static int acerhdf_get_trip_hyst(struct thermal_zone_device *thermal, int trip,
464} 463}
465 464
466static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip, 465static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip,
467 unsigned long *temp) 466 int *temp)
468{ 467{
469 if (trip == 0) 468 if (trip == 0)
470 *temp = fanon; 469 *temp = fanon;
@@ -477,7 +476,7 @@ static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip,
477} 476}
478 477
479static int acerhdf_get_crit_temp(struct thermal_zone_device *thermal, 478static int acerhdf_get_crit_temp(struct thermal_zone_device *thermal,
480 unsigned long *temperature) 479 int *temperature)
481{ 480{
482 *temperature = ACERHDF_TEMP_CRIT; 481 *temperature = ACERHDF_TEMP_CRIT;
483 return 0; 482 return 0;