diff mbox

Thermal: thermal API cleanup

Message ID 1366211920.2091.55.camel@rzhang1-mobl4 (mailing list archive)
State Accepted, archived
Delegated to: Zhang Rui
Headers show

Commit Message

Zhang, Rui April 17, 2013, 3:18 p.m. UTC 
From d6db6ba9831d07338e11d4821febec4ef3cdf8f6 Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 17 Apr 2013 23:12:40 +0800
Subject: [PATCH] Thermal: thermal API cleanup

We build all the thermal governors into thermal module,
thus a couple of APIs should be cleaned up as they are used
by thermal governors only.

Cleanup for get_tz_trend(), get_thermal_instance(),
and thermal_cdev_update(), in this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 Documentation/thermal/sysfs-api.txt |   19 +------------------
 drivers/thermal/thermal_core.c      |    3 ---
 drivers/thermal/thermal_core.h      |    5 +++++
 include/linux/thermal.h             |    4 ----
 4 files changed, 6 insertions(+), 25 deletions(-)

Comments

durgadoss.r@intel.com April 17, 2013, 4:17 p.m. UTC | #1 
PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBsaW51eC1wbS1vd25lckB2Z2Vy
Lmtlcm5lbC5vcmcgW21haWx0bzpsaW51eC1wbS0NCj4gb3duZXJAdmdlci5rZXJuZWwub3JnXSBP
biBCZWhhbGYgT2YgWmhhbmcgUnVpDQo+IFNlbnQ6IFdlZG5lc2RheSwgQXByaWwgMTcsIDIwMTMg
ODo0OSBQTQ0KPiBUbzogTGludXggUE0gbGlzdA0KPiBDYzogZWR1YXJkbzsgWmhhbmcsIFJ1aQ0K
PiBTdWJqZWN0OiBbUEFUQ0hdIFRoZXJtYWw6IHRoZXJtYWwgQVBJIGNsZWFudXANCj4gDQo+IEZy
b20gZDZkYjZiYTk4MzFkMDczMzhlMTFkNDgyMWZlYmVjNGVmM2NkZjhmNiBNb24gU2VwIDE3IDAw
OjAwOjAwDQo+IDIwMDENCj4gRnJvbTogWmhhbmcgUnVpIDxydWkuemhhbmdAaW50ZWwuY29tPg0K
PiBEYXRlOiBXZWQsIDE3IEFwciAyMDEzIDIzOjEyOjQwICswODAwDQo+IFN1YmplY3Q6IFtQQVRD
SF0gVGhlcm1hbDogdGhlcm1hbCBBUEkgY2xlYW51cA0KPiANCj4gV2UgYnVpbGQgYWxsIHRoZSB0
aGVybWFsIGdvdmVybm9ycyBpbnRvIHRoZXJtYWwgbW9kdWxlLA0KPiB0aHVzIGEgY291cGxlIG9m
IEFQSXMgc2hvdWxkIGJlIGNsZWFuZWQgdXAgYXMgdGhleSBhcmUgdXNlZA0KPiBieSB0aGVybWFs
IGdvdmVybm9ycyBvbmx5Lg0KPiANCj4gQ2xlYW51cCBmb3IgZ2V0X3R6X3RyZW5kKCksIGdldF90
aGVybWFsX2luc3RhbmNlKCksDQo+IGFuZCB0aGVybWFsX2NkZXZfdXBkYXRlKCksIGluIHRoaXMg
cGF0Y2guDQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBaaGFuZyBSdWkgPHJ1aS56aGFuZ0BpbnRlbC5j
b20+DQoNCkxvb2tzIGdvb2QgdG8gbWUsDQpBY2tlZC1ieTogRHVyZ2Fkb3NzIFIgPGR1cmdhZG9z
cy5yQGludGVsLmNvbT4NCg0KVGhhbmtzLA0KRHVyZ2ENCg0KPiAtLS0NCj4gIERvY3VtZW50YXRp
b24vdGhlcm1hbC9zeXNmcy1hcGkudHh0IHwgICAxOSArLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICBk
cml2ZXJzL3RoZXJtYWwvdGhlcm1hbF9jb3JlLmMgICAgICB8ICAgIDMgLS0tDQo+ICBkcml2ZXJz
L3RoZXJtYWwvdGhlcm1hbF9jb3JlLmggICAgICB8ICAgIDUgKysrKysNCj4gIGluY2x1ZGUvbGlu
dXgvdGhlcm1hbC5oICAgICAgICAgICAgIHwgICAgNCAtLS0tDQo+ICA0IGZpbGVzIGNoYW5nZWQs
IDYgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvRG9j
dW1lbnRhdGlvbi90aGVybWFsL3N5c2ZzLWFwaS50eHQNCj4gYi9Eb2N1bWVudGF0aW9uL3RoZXJt
YWwvc3lzZnMtYXBpLnR4dA0KPiBpbmRleCBiMmZmZTk4Li40ZGNjNGM3IDEwMDY0NA0KPiAtLS0g
YS9Eb2N1bWVudGF0aW9uL3RoZXJtYWwvc3lzZnMtYXBpLnR4dA0KPiArKysgYi9Eb2N1bWVudGF0
aW9uL3RoZXJtYWwvc3lzZnMtYXBpLnR4dA0KPiBAQCAtMzU1LDI3ICszNTUsMTAgQEAgY3Jvc3Nl
cyBhbnkgb2YgdGhlIGNvbmZpZ3VyZWQgdGhyZXNob2xkcy4NCj4gDQo+ICA1LiBFeHBvcnQgU3lt
Ym9sIEFQSXM6DQo+IA0KPiAtNS4xOiBnZXRfdHpfdHJlbmQ6DQo+IC1UaGlzIGZ1bmN0aW9uIHJl
dHVybnMgdGhlIHRyZW5kIG9mIGEgdGhlcm1hbCB6b25lLCBpLmUgdGhlIHJhdGUgb2YgY2hhbmdl
DQo+IC1vZiB0ZW1wZXJhdHVyZSBvZiB0aGUgdGhlcm1hbCB6b25lLiBJZGVhbGx5LCB0aGUgdGhl
cm1hbCBzZW5zb3IgZHJpdmVycw0KPiAtYXJlIHN1cHBvc2VkIHRvIGltcGxlbWVudCB0aGUgY2Fs
bGJhY2suIElmIHRoZXkgZG9uJ3QsIHRoZSB0aGVybWFsDQo+IC1mcmFtZXdvcmsgY2FsY3VsYXRl
ZCB0aGUgdHJlbmQgYnkgY29tcGFyaW5nIHRoZSBwcmV2aW91cyBhbmQgdGhlIGN1cnJlbnQNCj4g
LXRlbXBlcmF0dXJlIHZhbHVlcy4NCj4gLQ0KPiAtNS4yOmdldF90aGVybWFsX2luc3RhbmNlOg0K
PiAtVGhpcyBmdW5jdGlvbiByZXR1cm5zIHRoZSB0aGVybWFsX2luc3RhbmNlIGNvcnJlc3BvbmRp
bmcgdG8gYSBnaXZlbg0KPiAte3RoZXJtYWxfem9uZSwgY29vbGluZ19kZXZpY2UsIHRyaXBfcG9p
bnR9IGNvbWJpbmF0aW9uLiBSZXR1cm5zIE5VTEwNCj4gLWlmIHN1Y2ggYW4gaW5zdGFuY2UgZG9l
cyBub3QgZXhpc3QuDQo+IC0NCj4gLTUuMzpub3RpZnlfdGhlcm1hbF9mcmFtZXdvcms6DQo+ICs1
LjE6bm90aWZ5X3RoZXJtYWxfZnJhbWV3b3JrOg0KPiAgVGhpcyBmdW5jdGlvbiBoYW5kbGVzIHRo
ZSB0cmlwIGV2ZW50cyBmcm9tIHNlbnNvciBkcml2ZXJzLiBJdCBzdGFydHMNCj4gIHRocm90dGxp
bmcgdGhlIGNvb2xpbmcgZGV2aWNlcyBhY2NvcmRpbmcgdG8gdGhlIHBvbGljeSBjb25maWd1cmVk
Lg0KPiAgRm9yIENSSVRJQ0FMIGFuZCBIT1QgdHJpcCBwb2ludHMsIHRoaXMgbm90aWZpZXMgdGhl
IHJlc3BlY3RpdmUgZHJpdmVycywNCj4gIGFuZCBkb2VzIGFjdHVhbCB0aHJvdHRsaW5nIGZvciBv
dGhlciB0cmlwIHBvaW50cyBpLmUgQUNUSVZFIGFuZCBQQVNTSVZFLg0KPiAgVGhlIHRocm90dGxp
bmcgcG9saWN5IGlzIGJhc2VkIG9uIHRoZSBjb25maWd1cmVkIHBsYXRmb3JtIGRhdGE7IGlmIG5v
DQo+ICBwbGF0Zm9ybSBkYXRhIGlzIHByb3ZpZGVkLCB0aGlzIHVzZXMgdGhlIHN0ZXBfd2lzZSB0
aHJvdHRsaW5nIHBvbGljeS4NCj4gLQ0KPiAtNS40OnRoZXJtYWxfY2Rldl91cGRhdGU6DQo+IC1U
aGlzIGZ1bmN0aW9uIHNlcnZlcyBhcyBhbiBhcmJpdHJhdG9yIHRvIHNldCB0aGUgc3RhdGUgb2Yg
YSBjb29saW5nDQo+IC1kZXZpY2UuIEl0IHNldHMgdGhlIGNvb2xpbmcgZGV2aWNlIHRvIHRoZSBk
ZWVwZXN0IGNvb2xpbmcgc3RhdGUgaWYNCj4gLXBvc3NpYmxlLg0KPiBkaWZmIC0tZ2l0IGEvZHJp
dmVycy90aGVybWFsL3RoZXJtYWxfY29yZS5jDQo+IGIvZHJpdmVycy90aGVybWFsL3RoZXJtYWxf
Y29yZS5jDQo+IGluZGV4IDRjZGMzZTMuLmFjMzgwZmMgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv
dGhlcm1hbC90aGVybWFsX2NvcmUuYw0KPiArKysgYi9kcml2ZXJzL3RoZXJtYWwvdGhlcm1hbF9j
b3JlLmMNCj4gQEAgLTE2Niw3ICsxNjYsNiBAQCBpbnQgZ2V0X3R6X3RyZW5kKHN0cnVjdCB0aGVy
bWFsX3pvbmVfZGV2aWNlICp0eiwgaW50DQo+IHRyaXApDQo+IA0KPiAgCXJldHVybiB0cmVuZDsN
Cj4gIH0NCj4gLUVYUE9SVF9TWU1CT0woZ2V0X3R6X3RyZW5kKTsNCj4gDQo+ICBzdHJ1Y3QgdGhl
cm1hbF9pbnN0YW5jZSAqZ2V0X3RoZXJtYWxfaW5zdGFuY2Uoc3RydWN0DQo+IHRoZXJtYWxfem9u
ZV9kZXZpY2UgKnR6LA0KPiAgCQkJc3RydWN0IHRoZXJtYWxfY29vbGluZ19kZXZpY2UgKmNkZXYs
IGludCB0cmlwKQ0KPiBAQCAtMTg5LDcgKzE4OCw2IEBAIHN0cnVjdCB0aGVybWFsX2luc3RhbmNl
DQo+ICpnZXRfdGhlcm1hbF9pbnN0YW5jZShzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqdHos
DQo+IA0KPiAgCXJldHVybiB0YXJnZXRfaW5zdGFuY2U7DQo+ICB9DQo+IC1FWFBPUlRfU1lNQk9M
KGdldF90aGVybWFsX2luc3RhbmNlKTsNCj4gDQo+ICBzdGF0aWMgdm9pZCBwcmludF9iaW5kX2Vy
cl9tc2coc3RydWN0IHRoZXJtYWxfem9uZV9kZXZpY2UgKnR6LA0KPiAgCQkJc3RydWN0IHRoZXJt
YWxfY29vbGluZ19kZXZpY2UgKmNkZXYsIGludCByZXQpDQo+IEBAIC0xNDE1LDcgKzE0MTMsNiBA
QCB2b2lkIHRoZXJtYWxfY2Rldl91cGRhdGUoc3RydWN0DQo+IHRoZXJtYWxfY29vbGluZ19kZXZp
Y2UgKmNkZXYpDQo+ICAJY2Rldi0+b3BzLT5zZXRfY3VyX3N0YXRlKGNkZXYsIHRhcmdldCk7DQo+
ICAJY2Rldi0+dXBkYXRlZCA9IHRydWU7DQo+ICB9DQo+IC1FWFBPUlRfU1lNQk9MKHRoZXJtYWxf
Y2Rldl91cGRhdGUpOw0KPiANCj4gIC8qKg0KPiAgICogbm90aWZ5X3RoZXJtYWxfZnJhbWV3b3Jr
IC0gU2Vuc29yIGRyaXZlcnMgdXNlIHRoaXMgQVBJIHRvIG5vdGlmeQ0KPiBmcmFtZXdvcmsNCj4g
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdGhlcm1hbC90aGVybWFsX2NvcmUuaA0KPiBiL2RyaXZlcnMv
dGhlcm1hbC90aGVybWFsX2NvcmUuaA0KPiBpbmRleCA3Y2YyZjY2Li4wYmI5OGQyIDEwMDY0NA0K
PiAtLS0gYS9kcml2ZXJzL3RoZXJtYWwvdGhlcm1hbF9jb3JlLmgNCj4gKysrIGIvZHJpdmVycy90
aGVybWFsL3RoZXJtYWxfY29yZS5oDQo+IEBAIC01MCw2ICs1MCwxMSBAQCBzdHJ1Y3QgdGhlcm1h
bF9pbnN0YW5jZSB7DQo+ICAJc3RydWN0IGxpc3RfaGVhZCBjZGV2X25vZGU7IC8qIG5vZGUgaW4g
Y2Rldi0+dGhlcm1hbF9pbnN0YW5jZXMgKi8NCj4gIH07DQo+IA0KPiAraW50IGdldF90el90cmVu
ZChzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqLCBpbnQpOw0KPiArc3RydWN0IHRoZXJtYWxf
aW5zdGFuY2UgKmdldF90aGVybWFsX2luc3RhbmNlKHN0cnVjdA0KPiB0aGVybWFsX3pvbmVfZGV2
aWNlICosDQo+ICsgICAgICAgICAgICAgICAgc3RydWN0IHRoZXJtYWxfY29vbGluZ19kZXZpY2Ug
KiwgaW50KTsNCj4gK3ZvaWQgdGhlcm1hbF9jZGV2X3VwZGF0ZShzdHJ1Y3QgdGhlcm1hbF9jb29s
aW5nX2RldmljZSAqKTsNCj4gKw0KPiAgaW50IHRoZXJtYWxfcmVnaXN0ZXJfZ292ZXJub3Ioc3Ry
dWN0IHRoZXJtYWxfZ292ZXJub3IgKik7DQo+ICB2b2lkIHRoZXJtYWxfdW5yZWdpc3Rlcl9nb3Zl
cm5vcihzdHJ1Y3QgdGhlcm1hbF9nb3Zlcm5vciAqKTsNCj4gDQo+IGRpZmYgLS1naXQgYS9pbmNs
dWRlL2xpbnV4L3RoZXJtYWwuaCBiL2luY2x1ZGUvbGludXgvdGhlcm1hbC5oDQo+IGluZGV4IDQ0
NDViOTUuLjA5N2U2NzQgMTAwNjQ0DQo+IC0tLSBhL2luY2x1ZGUvbGludXgvdGhlcm1hbC5oDQo+
ICsrKyBiL2luY2x1ZGUvbGludXgvdGhlcm1hbC5oDQo+IEBAIC0yNDAsMTAgKzI0MCw2IEBAIHN0
cnVjdCB0aGVybWFsX2Nvb2xpbmdfZGV2aWNlDQo+ICp0aGVybWFsX2Nvb2xpbmdfZGV2aWNlX3Jl
Z2lzdGVyKGNoYXIgKiwgdm9pZCAqLA0KPiAgCQljb25zdCBzdHJ1Y3QgdGhlcm1hbF9jb29saW5n
X2RldmljZV9vcHMgKik7DQo+ICB2b2lkIHRoZXJtYWxfY29vbGluZ19kZXZpY2VfdW5yZWdpc3Rl
cihzdHJ1Y3QgdGhlcm1hbF9jb29saW5nX2RldmljZSAqKTsNCj4gDQo+IC1pbnQgZ2V0X3R6X3Ry
ZW5kKHN0cnVjdCB0aGVybWFsX3pvbmVfZGV2aWNlICosIGludCk7DQo+IC1zdHJ1Y3QgdGhlcm1h
bF9pbnN0YW5jZSAqZ2V0X3RoZXJtYWxfaW5zdGFuY2Uoc3RydWN0DQo+IHRoZXJtYWxfem9uZV9k
ZXZpY2UgKiwNCj4gLQkJc3RydWN0IHRoZXJtYWxfY29vbGluZ19kZXZpY2UgKiwgaW50KTsNCj4g
LXZvaWQgdGhlcm1hbF9jZGV2X3VwZGF0ZShzdHJ1Y3QgdGhlcm1hbF9jb29saW5nX2RldmljZSAq
KTsNCj4gIHZvaWQgbm90aWZ5X3RoZXJtYWxfZnJhbWV3b3JrKHN0cnVjdCB0aGVybWFsX3pvbmVf
ZGV2aWNlICosIGludCk7DQo+IA0KPiAgI2lmZGVmIENPTkZJR19ORVQNCj4gLS0NCj4gMS43Ljku
NQ0KPiANCj4gDQo+IA0KPiAtLQ0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2Vu
ZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtcG0iIGluDQo+IHRoZSBib2R5IG9mIGEgbWVz
c2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnDQo+IE1vcmUgbWFqb3Jkb21vIGluZm8g
YXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbA0K
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eduardo Valentin April 17, 2013, 5:13 p.m. UTC | #2 
Rui,

On 17-04-2013 11:18, Zhang Rui wrote:
>>From d6db6ba9831d07338e11d4821febec4ef3cdf8f6 Mon Sep 17 00:00:00 2001
> From: Zhang Rui <rui.zhang@intel.com>
> Date: Wed, 17 Apr 2013 23:12:40 +0800
> Subject: [PATCH] Thermal: thermal API cleanup
>
> We build all the thermal governors into thermal module,
> thus a couple of APIs should be cleaned up as they are used
> by thermal governors only.
>
> Cleanup for get_tz_trend(), get_thermal_instance(),
> and thermal_cdev_update(), in this patch.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>

Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>

> ---
>   Documentation/thermal/sysfs-api.txt |   19 +------------------
>   drivers/thermal/thermal_core.c      |    3 ---
>   drivers/thermal/thermal_core.h      |    5 +++++
>   include/linux/thermal.h             |    4 ----
>   4 files changed, 6 insertions(+), 25 deletions(-)
>
> diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
> index b2ffe98..4dcc4c7 100644
> --- a/Documentation/thermal/sysfs-api.txt
> +++ b/Documentation/thermal/sysfs-api.txt
> @@ -355,27 +355,10 @@ crosses any of the configured thresholds.
>
>   5. Export Symbol APIs:
>
> -5.1: get_tz_trend:
> -This function returns the trend of a thermal zone, i.e the rate of change
> -of temperature of the thermal zone. Ideally, the thermal sensor drivers
> -are supposed to implement the callback. If they don't, the thermal
> -framework calculated the trend by comparing the previous and the current
> -temperature values.
> -
> -5.2:get_thermal_instance:
> -This function returns the thermal_instance corresponding to a given
> -{thermal_zone, cooling_device, trip_point} combination. Returns NULL
> -if such an instance does not exist.
> -
> -5.3:notify_thermal_framework:
> +5.1:notify_thermal_framework:
>   This function handles the trip events from sensor drivers. It starts
>   throttling the cooling devices according to the policy configured.
>   For CRITICAL and HOT trip points, this notifies the respective drivers,
>   and does actual throttling for other trip points i.e ACTIVE and PASSIVE.
>   The throttling policy is based on the configured platform data; if no
>   platform data is provided, this uses the step_wise throttling policy.
> -
> -5.4:thermal_cdev_update:
> -This function serves as an arbitrator to set the state of a cooling
> -device. It sets the cooling device to the deepest cooling state if
> -possible.
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 4cdc3e3..ac380fc 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -166,7 +166,6 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip)
>
>   	return trend;
>   }
> -EXPORT_SYMBOL(get_tz_trend);
>
>   struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz,
>   			struct thermal_cooling_device *cdev, int trip)
> @@ -189,7 +188,6 @@ struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz,
>
>   	return target_instance;
>   }
> -EXPORT_SYMBOL(get_thermal_instance);
>
>   static void print_bind_err_msg(struct thermal_zone_device *tz,
>   			struct thermal_cooling_device *cdev, int ret)
> @@ -1415,7 +1413,6 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev)
>   	cdev->ops->set_cur_state(cdev, target);
>   	cdev->updated = true;
>   }
> -EXPORT_SYMBOL(thermal_cdev_update);
>
>   /**
>    * notify_thermal_framework - Sensor drivers use this API to notify framework
> diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
> index 7cf2f66..0bb98d2 100644
> --- a/drivers/thermal/thermal_core.h
> +++ b/drivers/thermal/thermal_core.h
> @@ -50,6 +50,11 @@ struct thermal_instance {
>   	struct list_head cdev_node; /* node in cdev->thermal_instances */
>   };
>
> +int get_tz_trend(struct thermal_zone_device *, int);
> +struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
> +                struct thermal_cooling_device *, int);
> +void thermal_cdev_update(struct thermal_cooling_device *);
> +
>   int thermal_register_governor(struct thermal_governor *);
>   void thermal_unregister_governor(struct thermal_governor *);
>
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index 4445b95..097e674 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -240,10 +240,6 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
>   		const struct thermal_cooling_device_ops *);
>   void thermal_cooling_device_unregister(struct thermal_cooling_device *);
>
> -int get_tz_trend(struct thermal_zone_device *, int);
> -struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
> -		struct thermal_cooling_device *, int);
> -void thermal_cdev_update(struct thermal_cooling_device *);
>   void notify_thermal_framework(struct thermal_zone_device *, int);
>
>   #ifdef CONFIG_NET
>

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index b2ffe98..4dcc4c7 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -355,27 +355,10 @@  crosses any of the configured thresholds.
 
 5. Export Symbol APIs:
 
-5.1: get_tz_trend:
-This function returns the trend of a thermal zone, i.e the rate of change
-of temperature of the thermal zone. Ideally, the thermal sensor drivers
-are supposed to implement the callback. If they don't, the thermal
-framework calculated the trend by comparing the previous and the current
-temperature values.
-
-5.2:get_thermal_instance:
-This function returns the thermal_instance corresponding to a given
-{thermal_zone, cooling_device, trip_point} combination. Returns NULL
-if such an instance does not exist.
-
-5.3:notify_thermal_framework:
+5.1:notify_thermal_framework:
 This function handles the trip events from sensor drivers. It starts
 throttling the cooling devices according to the policy configured.
 For CRITICAL and HOT trip points, this notifies the respective drivers,
 and does actual throttling for other trip points i.e ACTIVE and PASSIVE.
 The throttling policy is based on the configured platform data; if no
 platform data is provided, this uses the step_wise throttling policy.
-
-5.4:thermal_cdev_update:
-This function serves as an arbitrator to set the state of a cooling
-device. It sets the cooling device to the deepest cooling state if
-possible.
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4cdc3e3..ac380fc 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -166,7 +166,6 @@  int get_tz_trend(struct thermal_zone_device *tz, int trip)
 
 	return trend;
 }
-EXPORT_SYMBOL(get_tz_trend);
 
 struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz,
 			struct thermal_cooling_device *cdev, int trip)
@@ -189,7 +188,6 @@  struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz,
 
 	return target_instance;
 }
-EXPORT_SYMBOL(get_thermal_instance);
 
 static void print_bind_err_msg(struct thermal_zone_device *tz,
 			struct thermal_cooling_device *cdev, int ret)
@@ -1415,7 +1413,6 @@  void thermal_cdev_update(struct thermal_cooling_device *cdev)
 	cdev->ops->set_cur_state(cdev, target);
 	cdev->updated = true;
 }
-EXPORT_SYMBOL(thermal_cdev_update);
 
 /**
  * notify_thermal_framework - Sensor drivers use this API to notify framework
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 7cf2f66..0bb98d2 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -50,6 +50,11 @@  struct thermal_instance {
 	struct list_head cdev_node; /* node in cdev->thermal_instances */
 };
 
+int get_tz_trend(struct thermal_zone_device *, int);
+struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
+                struct thermal_cooling_device *, int);
+void thermal_cdev_update(struct thermal_cooling_device *);
+
 int thermal_register_governor(struct thermal_governor *);
 void thermal_unregister_governor(struct thermal_governor *);
 
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 4445b95..097e674 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -240,10 +240,6 @@  struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
 		const struct thermal_cooling_device_ops *);
 void thermal_cooling_device_unregister(struct thermal_cooling_device *);
 
-int get_tz_trend(struct thermal_zone_device *, int);
-struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
-		struct thermal_cooling_device *, int);
-void thermal_cdev_update(struct thermal_cooling_device *);
 void notify_thermal_framework(struct thermal_zone_device *, int);
 
 #ifdef CONFIG_NET