Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 374573
b: refs/heads/master
c: a00e55f
h: refs/heads/master
i:
  374571: aa2590b
v: v3
  • Loading branch information
Eduardo Valentin authored and Zhang Rui committed Apr 24, 2013
1 parent d44375d commit 1b3c7e5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 269c174f27d2753ae809b86c9fbf5a8743a1c065
refs/heads/master: a00e55f9c8c06e2bba5db5f2e7dec16b86d560ec
9 changes: 8 additions & 1 deletion trunk/drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
}

/**
* thermal_zone_device_register - register a new thermal zone device
* thermal_zone_device_register() - register a new thermal zone device
* @type: the thermal zone device type
* @trips: the number of trip points the thermal zone support
* @mask: a bit string indicating the writeablility of trip points
Expand All @@ -1593,8 +1593,15 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
* whether trip points have been crossed (0 for interrupt
* driven systems)
*
* This interface function adds a new thermal zone device (sensor) to
* /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the
* thermal cooling devices registered at the same time.
* thermal_zone_device_unregister() must be called when the device is no
* longer needed. The passive cooling depends on the .get_trend() return value.
*
* Return: a pointer to the created struct thermal_zone_device or an
* in case of error, an ERR_PTR. Caller must check return value with
* IS_ERR*() helpers.
*/
struct thermal_zone_device *thermal_zone_device_register(const char *type,
int trips, int mask, void *devdata,
Expand Down

0 comments on commit 1b3c7e5

Please sign in to comment.