From 24464a5be19e8259785d8aa5a68f71a439d042b2 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Tue, 23 Apr 2013 21:48:17 +0000 Subject: [PATCH] --- yaml --- r: 374570 b: refs/heads/master c: 9892e5dc56f185d104e6dddd1e2d0f6ae8f4f211 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/thermal/thermal_core.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ffdeefe5ee8..7dd42655717c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2e4eb83e7523c5b673ce3004d514c1d1ec32618 +refs/heads/master: 9892e5dc56f185d104e6dddd1e2d0f6ae8f4f211 diff --git a/trunk/drivers/thermal/thermal_core.c b/trunk/drivers/thermal/thermal_core.c index 5f6af8ade324..9550e6897114 100644 --- a/trunk/drivers/thermal/thermal_core.c +++ b/trunk/drivers/thermal/thermal_core.c @@ -1222,13 +1222,18 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device); /** - * thermal_zone_unbind_cooling_device - unbind a cooling device from a thermal zone - * @tz: thermal zone device + * thermal_zone_unbind_cooling_device() - unbind a cooling device from a + * thermal zone. + * @tz: pointer to a struct thermal_zone_device. * @trip: indicates which trip point the cooling devices is * associated with in this thermal zone. - * @cdev: thermal cooling device + * @cdev: pointer to a struct thermal_cooling_device. * + * This interface function unbind a thermal cooling device from the certain + * trip point of a thermal zone device. * This function is usually called in the thermal zone device .unbind callback. + * + * Return: 0 on success, the proper error value otherwise. */ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, int trip,