diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/thermal/thermal_sys.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 760e045c93c8..7d0e63c79280 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c | |||
@@ -841,11 +841,8 @@ static struct class thermal_class = { | |||
841 | * @devdata: device private data. | 841 | * @devdata: device private data. |
842 | * @ops: standard thermal cooling devices callbacks. | 842 | * @ops: standard thermal cooling devices callbacks. |
843 | */ | 843 | */ |
844 | struct thermal_cooling_device *thermal_cooling_device_register(char *type, | 844 | struct thermal_cooling_device *thermal_cooling_device_register( |
845 | void *devdata, | 845 | char *type, void *devdata, const struct thermal_cooling_device_ops *ops) |
846 | struct | ||
847 | thermal_cooling_device_ops | ||
848 | *ops) | ||
849 | { | 846 | { |
850 | struct thermal_cooling_device *cdev; | 847 | struct thermal_cooling_device *cdev; |
851 | struct thermal_zone_device *pos; | 848 | struct thermal_zone_device *pos; |
@@ -1066,13 +1063,9 @@ EXPORT_SYMBOL(thermal_zone_device_update); | |||
1066 | * section 11.1.5.1 of the ACPI specification 3.0. | 1063 | * section 11.1.5.1 of the ACPI specification 3.0. |
1067 | */ | 1064 | */ |
1068 | struct thermal_zone_device *thermal_zone_device_register(char *type, | 1065 | struct thermal_zone_device *thermal_zone_device_register(char *type, |
1069 | int trips, | 1066 | int trips, void *devdata, |
1070 | void *devdata, struct | 1067 | const struct thermal_zone_device_ops *ops, |
1071 | thermal_zone_device_ops | 1068 | int tc1, int tc2, int passive_delay, int polling_delay) |
1072 | *ops, int tc1, int | ||
1073 | tc2, | ||
1074 | int passive_delay, | ||
1075 | int polling_delay) | ||
1076 | { | 1069 | { |
1077 | struct thermal_zone_device *tz; | 1070 | struct thermal_zone_device *tz; |
1078 | struct thermal_cooling_device *pos; | 1071 | struct thermal_cooling_device *pos; |