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

Merge branch 'misc' into release

Browse Source
This commit is contained in:
Len Brown
2011-01-12 05:14:15 -05:00
parent 3e09898407 5b275ce270
commit 156d821270
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/thermal/thermal_sys.c
View File

@@ -841,11 +841,8 @@ static struct class thermal_class = {
* @devdata: device private data. * @devdata: device private data.
* @ops: standard thermal cooling devices callbacks. * @ops: standard thermal cooling devices callbacks.
*/ */
struct thermal_cooling_device *thermal_cooling_device_register(char *type, struct thermal_cooling_device *thermal_cooling_device_register(
void *devdata, char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
struct
thermal_cooling_device_ops
*ops)
{ {
struct thermal_cooling_device *cdev; struct thermal_cooling_device *cdev;
struct thermal_zone_device *pos; struct thermal_zone_device *pos;
@@ -1066,13 +1063,9 @@ EXPORT_SYMBOL(thermal_zone_device_update);
* section 11.1.5.1 of the ACPI specification 3.0. * section 11.1.5.1 of the ACPI specification 3.0.
*/ */
struct thermal_zone_device *thermal_zone_device_register(char *type, struct thermal_zone_device *thermal_zone_device_register(char *type,
int trips, int trips, void *devdata,
void *devdata, struct const struct thermal_zone_device_ops *ops,
thermal_zone_device_ops int tc1, int tc2, int passive_delay, int polling_delay)
*ops, int tc1, int
tc2,
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;

15
include/linux/thermal.h
View File

@@ -77,7 +77,7 @@ struct thermal_cooling_device {
char type[THERMAL_NAME_LENGTH]; char type[THERMAL_NAME_LENGTH];
struct device device; struct device device;
void *devdata; void *devdata;
struct thermal_cooling_device_ops *ops; const struct thermal_cooling_device_ops *ops;
struct list_head node; struct list_head node;
}; };
@@ -114,7 +114,7 @@ struct thermal_zone_device {
int last_temperature; int last_temperature;
bool passive; bool passive;
unsigned int forced_passive; unsigned int forced_passive;
struct thermal_zone_device_ops *ops; const struct thermal_zone_device_ops *ops;
struct list_head cooling_devices; struct list_head cooling_devices;
struct idr idr; struct idr idr;
struct mutex lock; /* protect cooling devices list */ struct mutex lock; /* protect cooling devices list */
@@ -160,11 +160,8 @@ 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(char *, int, void *, struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
struct const struct thermal_zone_device_ops *, int tc1, int tc2,
thermal_zone_device_ops int passive_freq, int polling_freq);
*, int tc1, 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,
@@ -173,9 +170,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
struct thermal_cooling_device *); struct thermal_cooling_device *);
void thermal_zone_device_update(struct thermal_zone_device *); void thermal_zone_device_update(struct thermal_zone_device *);
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *, struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
struct const struct thermal_cooling_device_ops *);
thermal_cooling_device_ops
*);
void thermal_cooling_device_unregister(struct thermal_cooling_device *); void thermal_cooling_device_unregister(struct thermal_cooling_device *);
extern int generate_netlink_event(u32 orig, enum events event); extern int generate_netlink_event(u32 orig, enum events event);