From 9d7a2c0502697e61b6e81478faf1298ccc056d15 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Thu, 8 Mar 2012 11:11:16 +0200 Subject: TI thermal framework: standardize thermal device ops This patch changes the .process_temp callback of governor type of thermal devices. The aim is to make all callbacks standard. Now, all callbacks receive as first parameter the affected thermal device. Change-Id: I9857146e852a7f7d6ac502d044b7f104aa7eb466 Signed-off-by: Eduardo Valentin --- drivers/staging/thermal_framework/governor/omap_die_governor.c | 3 ++- drivers/staging/thermal_framework/thermal_framework.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/thermal_framework/governor/omap_die_governor.c b/drivers/staging/thermal_framework/governor/omap_die_governor.c index b0cd29f..70f8106 100644 --- a/drivers/staging/thermal_framework/governor/omap_die_governor.c +++ b/drivers/staging/thermal_framework/governor/omap_die_governor.c @@ -611,7 +611,8 @@ static void average_cpu_sensor_delayed_work_fn(struct work_struct *work) msecs_to_jiffies(omap_gov->average_period)); } -static int omap_process_cpu_temp(struct list_head *cooling_list, +static int omap_process_cpu_temp(struct thermal_dev *gov, + struct list_head *cooling_list, struct thermal_dev *temp_sensor, int temp) { diff --git a/drivers/staging/thermal_framework/thermal_framework.c b/drivers/staging/thermal_framework/thermal_framework.c index d83b8ee..01146f1 100644 --- a/drivers/staging/thermal_framework/thermal_framework.c +++ b/drivers/staging/thermal_framework/thermal_framework.c @@ -134,7 +134,8 @@ int thermal_sensor_set_temp(struct thermal_dev *tdev) thermal_domain->governor->dev_ops && thermal_domain->governor->dev_ops->process_temp) { thermal_domain->governor->dev_ops->process_temp - (&thermal_domain->cooling_agents, + (thermal_domain->governor, + &thermal_domain->cooling_agents, tdev, tdev->current_temp); ret = 0; goto out; -- cgit v1.1