lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thermal: Remove tc1/tc2 in generic thermal layer.

Browse Source 
Remove tc1/tc2 in generic thermal layer.
.get_trend() callback starts to take effect from this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Valentin, Eduardo <eduardo.valentin@ti.com>
This commit is contained in:
Zhang Rui
2012-06-27 09:51:12 +08:00
parent 601f3d4242
commit 1b7ddb840c
8 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/thermal.c
View File

@@ -897,15 +897,12 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
tz->thermal_zone = tz->thermal_zone =
thermal_zone_device_register("acpitz", trips, 0, tz, thermal_zone_device_register("acpitz", trips, 0, tz,
&acpi_thermal_zone_ops, &acpi_thermal_zone_ops,
tz->trips.passive.tc1,
tz->trips.passive.tc2,
tz->trips.passive.tsp*100, tz->trips.passive.tsp*100,
tz->polling_frequency*100); tz->polling_frequency*100);
else else
tz->thermal_zone = tz->thermal_zone =
thermal_zone_device_register("acpitz", trips, 0, tz, thermal_zone_device_register("acpitz", trips, 0, tz,
&acpi_thermal_zone_ops, &acpi_thermal_zone_ops, 0,
0, 0, 0,
tz->polling_frequency*100); tz->polling_frequency*100);
if (IS_ERR(tz->thermal_zone)) if (IS_ERR(tz->thermal_zone))
return -ENODEV; return -ENODEV;

2
drivers/platform/x86/acerhdf.c
View File

@@ -662,7 +662,7 @@ static int acerhdf_register_thermal(void)
return -EINVAL; return -EINVAL;
thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,
&acerhdf_dev_ops, 0, 0, 0, &acerhdf_dev_ops, 0,
(kernelmode) ? interval*1000 : 0); (kernelmode) ? interval*1000 : 0);
if (IS_ERR(thz_dev)) if (IS_ERR(thz_dev))
return -EINVAL; return -EINVAL;

2
drivers/platform/x86/intel_mid_thermal.c
View File

@@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev)
goto err; goto err;
} }
pinfo->tzd[i] = thermal_zone_device_register(name[i], pinfo->tzd[i] = thermal_zone_device_register(name[i],
0, 0, td_info, &tzd_ops, 0, 0, 0, 0); 0, 0, td_info, &tzd_ops, 0, 0);
if (IS_ERR(pinfo->tzd[i])) { if (IS_ERR(pinfo->tzd[i])) {
kfree(td_info); kfree(td_info);
ret = PTR_ERR(pinfo->tzd[i]); ret = PTR_ERR(pinfo->tzd[i]);

2
drivers/power/power_supply_core.c
View File

@@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy)
for (i = 0; i < psy->num_properties; i++) { for (i = 0; i < psy->num_properties; i++) {
if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
psy->tzd = thermal_zone_device_register(psy->name, 0, 0, psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
psy, &psy_tzd_ops, 0, 0, 0, 0); psy, &psy_tzd_ops, 0, 0);
if (IS_ERR(psy->tzd)) if (IS_ERR(psy->tzd))
return PTR_ERR(psy->tzd); return PTR_ERR(psy->tzd);
break; break;

2
drivers/staging/omap-thermal/omap-thermal-common.c
View File

@@ -246,7 +246,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
/* Create thermal zone */ /* Create thermal zone */
data->omap_thermal = thermal_zone_device_register(domain, data->omap_thermal = thermal_zone_device_register(domain,
OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops, OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
0, FAST_TEMP_MONITORING_RATE, 0, 0); 0, FAST_TEMP_MONITORING_RATE);
if (IS_ERR_OR_NULL(data->omap_thermal)) { if (IS_ERR_OR_NULL(data->omap_thermal)) {
dev_err(bg_ptr->dev, "thermal zone device is NULL\n"); dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
return PTR_ERR(data->omap_thermal); return PTR_ERR(data->omap_thermal);

2
drivers/thermal/spear_thermal.c
View File

@@ -147,7 +147,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
writel_relaxed(stdev->flags, stdev->thermal_base); writel_relaxed(stdev->flags, stdev->thermal_base);
spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0, spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
stdev, &ops, 0, 0, 0, 0); stdev, &ops, 0, 0);
if (IS_ERR(spear_thermal)) { if (IS_ERR(spear_thermal)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n"); dev_err(&pdev->dev, "thermal zone device is NULL\n");
ret = PTR_ERR(spear_thermal); ret = PTR_ERR(spear_thermal);

24
drivers/thermal/thermal_sys.c
View File

@@ -335,9 +335,6 @@ passive_store(struct device *dev, struct device_attribute *attr,
tz->passive_delay = 0; tz->passive_delay = 0;
} }
tz->tc1 = 1;
tz->tc2 = 1;
tz->forced_passive = state; tz->forced_passive = state;
thermal_zone_device_update(tz); thermal_zone_device_update(tz);
@@ -718,13 +715,12 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
static void thermal_zone_device_passive(struct thermal_zone_device *tz, static void thermal_zone_device_passive(struct thermal_zone_device *tz,
int temp, int trip_temp, int trip) int temp, int trip_temp, int trip)
{ {
int trend = 0; enum thermal_trend trend;
struct thermal_cooling_device_instance *instance; struct thermal_cooling_device_instance *instance;
struct thermal_cooling_device *cdev; struct thermal_cooling_device *cdev;
long state, max_state; long state, max_state;
if (!tz->ops->get_trend || if (!tz->ops->get_trend || tz->ops->get_trend(tz, trip, &trend)) {
tz->ops->get_trend(tz, trip, (enum thermal_trend *)&trend)) {
/* /*
* compare the current temperature and previous temperature * compare the current temperature and previous temperature
* to get the thermal trend, if no special requirement * to get the thermal trend, if no special requirement
@@ -747,11 +743,8 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
if (temp >= trip_temp) { if (temp >= trip_temp) {
tz->passive = true; tz->passive = true;
trend = (tz->tc1 * (temp - tz->last_temperature)) +
(tz->tc2 * (temp - trip_temp));
/* Heating up? */ /* Heating up? */
if (trend > 0) { if (trend == THERMAL_TREND_RAISING) {
list_for_each_entry(instance, &tz->cooling_devices, list_for_each_entry(instance, &tz->cooling_devices,
node) { node) {
if (instance->trip != trip) if (instance->trip != trip)
@@ -762,7 +755,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
if (state++ < max_state) if (state++ < max_state)
cdev->ops->set_cur_state(cdev, state); cdev->ops->set_cur_state(cdev, state);
} }
} else if (trend < 0) { /* Cooling off? */ } else if (trend == THERMAL_TREND_DROPPING) { /* Cooling off? */
list_for_each_entry(instance, &tz->cooling_devices, list_for_each_entry(instance, &tz->cooling_devices,
node) { node) {
if (instance->trip != trip) if (instance->trip != trip)
@@ -1288,8 +1281,6 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
* @mask: a bit string indicating the writeablility of trip points * @mask: a bit string indicating the writeablility of trip points
* @devdata: private device data * @devdata: private device data
* @ops: standard thermal zone device callbacks * @ops: standard thermal zone device callbacks
* @tc1: thermal coefficient 1 for passive calculations
* @tc2: thermal coefficient 2 for passive calculations
* @passive_delay: number of milliseconds to wait between polls when * @passive_delay: number of milliseconds to wait between polls when
* performing passive cooling * performing passive cooling
* @polling_delay: number of milliseconds to wait between polls when checking * @polling_delay: number of milliseconds to wait between polls when checking
@@ -1297,13 +1288,12 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
* driven systems) * driven systems)
* *
* thermal_zone_device_unregister() must be called when the device is no * thermal_zone_device_unregister() must be called when the device is no
* longer needed. The passive cooling formula uses tc1 and tc2 as described in * longer needed. The passive cooling depends on the .get_trend() return value.
* section 11.1.5.1 of the ACPI specification 3.0.
*/ */
struct thermal_zone_device *thermal_zone_device_register(const char *type, struct thermal_zone_device *thermal_zone_device_register(const char *type,
int trips, int mask, void *devdata, int trips, int mask, void *devdata,
const struct thermal_zone_device_ops *ops, const struct thermal_zone_device_ops *ops,
int tc1, int tc2, int passive_delay, int polling_delay) int passive_delay, int polling_delay)
{ {
struct thermal_zone_device *tz; struct thermal_zone_device *tz;
struct thermal_cooling_device *pos; struct thermal_cooling_device *pos;
@@ -1339,8 +1329,6 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
tz->device.class = &thermal_class; tz->device.class = &thermal_class;
tz->devdata = devdata; tz->devdata = devdata;
tz->trips = trips; tz->trips = trips;
tz->tc1 = tc1;
tz->tc2 = tc2;
tz->passive_delay = passive_delay; tz->passive_delay = passive_delay;
tz->polling_delay = polling_delay; tz->polling_delay = polling_delay;

5
include/linux/thermal.h
View File

@@ -115,8 +115,6 @@ struct thermal_zone_device {
struct thermal_attr *trip_hyst_attrs; struct thermal_attr *trip_hyst_attrs;
void *devdata; void *devdata;
int trips; int trips;
int tc1;
int tc2;
int passive_delay; int passive_delay;
int polling_delay; int polling_delay;
int temperature; int temperature;
@@ -163,8 +161,7 @@ enum {
#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
void *, const struct thermal_zone_device_ops *, int tc1, void *, const struct thermal_zone_device_ops *, int, int);
int tc2, int passive_freq, int polling_freq);
void thermal_zone_device_unregister(struct thermal_zone_device *); void thermal_zone_device_unregister(struct thermal_zone_device *);
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,