From 5d2f529c9b83d5f769258928b5ddd82f4dc9979e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Mar 2016 20:42:51 +0000 Subject: mediatek: bump to v4.4 Signed-off-by: John Crispin SVN-Revision: 49064 --- ...Make-struct-thermal_zone_device_ops-const.patch | 282 --------------------- 1 file changed, 282 deletions(-) delete mode 100644 target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch (limited to 'target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch') diff --git a/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch b/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch deleted file mode 100644 index c91f6c8b31..0000000000 --- a/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch +++ /dev/null @@ -1,282 +0,0 @@ -From 7cbee588bc6eee59c025f89cf9324943fda98934 Mon Sep 17 00:00:00 2001 -From: Sascha Hauer -Date: Wed, 13 May 2015 10:52:38 +0200 -Subject: [PATCH 19/76] thermal: Make struct thermal_zone_device_ops const - -Now that the of thermal support no longer changes the -thermal_zone_device_ops it can be const again. - -Signed-off-by: Sascha Hauer ---- - Documentation/thermal/sysfs-api.txt | 2 +- - drivers/acpi/thermal.c | 2 +- - drivers/platform/x86/acerhdf.c | 2 +- - drivers/platform/x86/intel_mid_thermal.c | 2 +- - drivers/power/power_supply_core.c | 2 +- - drivers/thermal/armada_thermal.c | 2 +- - drivers/thermal/db8500_thermal.c | 2 +- - drivers/thermal/dove_thermal.c | 2 +- - drivers/thermal/imx_thermal.c | 2 +- - drivers/thermal/int340x_thermal/int3400_thermal.c | 2 +- - drivers/thermal/int340x_thermal/int340x_thermal_zone.c | 2 +- - drivers/thermal/intel_soc_dts_thermal.c | 2 +- - drivers/thermal/kirkwood_thermal.c | 2 +- - drivers/thermal/of-thermal.c | 2 +- - drivers/thermal/rcar_thermal.c | 2 +- - drivers/thermal/spear_thermal.c | 2 +- - drivers/thermal/st/st_thermal.c | 2 +- - drivers/thermal/thermal_core.c | 2 +- - drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- - drivers/thermal/x86_pkg_temp_thermal.c | 2 +- - include/linux/thermal.h | 6 +++--- - 21 files changed, 23 insertions(+), 23 deletions(-) - ---- a/Documentation/thermal/sysfs-api.txt -+++ b/Documentation/thermal/sysfs-api.txt -@@ -33,7 +33,7 @@ temperature) and throttle appropriate de - 1.1 thermal zone device interface - 1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *type, - int trips, int mask, void *devdata, -- struct thermal_zone_device_ops *ops, -+ const struct thermal_zone_device_ops *ops, - const struct thermal_zone_params *tzp, - int passive_delay, int polling_delay)) - ---- a/drivers/acpi/thermal.c -+++ b/drivers/acpi/thermal.c -@@ -869,7 +869,7 @@ acpi_thermal_unbind_cooling_device(struc - return acpi_thermal_cooling_device_cb(thermal, cdev, false); - } - --static struct thermal_zone_device_ops acpi_thermal_zone_ops = { -+static const struct thermal_zone_device_ops acpi_thermal_zone_ops = { - .bind = acpi_thermal_bind_cooling_device, - .unbind = acpi_thermal_unbind_cooling_device, - .get_temp = thermal_get_temp, ---- a/drivers/platform/x86/acerhdf.c -+++ b/drivers/platform/x86/acerhdf.c -@@ -482,7 +482,7 @@ static int acerhdf_get_crit_temp(struct - } - - /* bind callback functions to thermalzone */ --static struct thermal_zone_device_ops acerhdf_dev_ops = { -+static const struct thermal_zone_device_ops acerhdf_dev_ops = { - .bind = acerhdf_bind, - .unbind = acerhdf_unbind, - .get_temp = acerhdf_get_ec_temp, ---- a/drivers/platform/x86/intel_mid_thermal.c -+++ b/drivers/platform/x86/intel_mid_thermal.c -@@ -460,7 +460,7 @@ static int read_curr_temp(struct thermal - } - - /* Can't be const */ --static struct thermal_zone_device_ops tzd_ops = { -+static const struct thermal_zone_device_ops tzd_ops = { - .get_temp = read_curr_temp, - }; - ---- a/drivers/power/power_supply_core.c -+++ b/drivers/power/power_supply_core.c -@@ -535,7 +535,7 @@ static int power_supply_read_temp(struct - return ret; - } - --static struct thermal_zone_device_ops psy_tzd_ops = { -+static const struct thermal_zone_device_ops psy_tzd_ops = { - .get_temp = power_supply_read_temp, - }; - ---- a/drivers/thermal/armada_thermal.c -+++ b/drivers/thermal/armada_thermal.c -@@ -183,7 +183,7 @@ static int armada_get_temp(struct therma - return 0; - } - --static struct thermal_zone_device_ops ops = { -+static const struct thermal_zone_device_ops ops = { - .get_temp = armada_get_temp, - }; - ---- a/drivers/thermal/db8500_thermal.c -+++ b/drivers/thermal/db8500_thermal.c -@@ -210,7 +210,7 @@ static int db8500_sys_get_crit_temp(stru - return -EINVAL; - } - --static struct thermal_zone_device_ops thdev_ops = { -+static const struct thermal_zone_device_ops thdev_ops = { - .bind = db8500_cdev_bind, - .unbind = db8500_cdev_unbind, - .get_temp = db8500_sys_get_temp, ---- a/drivers/thermal/dove_thermal.c -+++ b/drivers/thermal/dove_thermal.c -@@ -118,7 +118,7 @@ static int dove_get_temp(struct thermal_ - return 0; - } - --static struct thermal_zone_device_ops ops = { -+static const struct thermal_zone_device_ops ops = { - .get_temp = dove_get_temp, - }; - ---- a/drivers/thermal/imx_thermal.c -+++ b/drivers/thermal/imx_thermal.c -@@ -332,7 +332,7 @@ static int imx_unbind(struct thermal_zon - return 0; - } - --static struct thermal_zone_device_ops imx_tz_ops = { -+static const struct thermal_zone_device_ops imx_tz_ops = { - .bind = imx_bind, - .unbind = imx_unbind, - .get_temp = imx_get_temp, ---- a/drivers/thermal/int340x_thermal/int3400_thermal.c -+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c -@@ -231,7 +231,7 @@ static int int3400_thermal_set_mode(stru - return result; - } - --static struct thermal_zone_device_ops int3400_thermal_ops = { -+static const struct thermal_zone_device_ops int3400_thermal_ops = { - .get_temp = int3400_thermal_get_temp, - }; - ---- a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c -+++ b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c -@@ -154,7 +154,7 @@ static int int340x_thermal_get_trip_hyst - return 0; - } - --static struct thermal_zone_device_ops int340x_thermal_zone_ops = { -+static const struct thermal_zone_device_ops int340x_thermal_zone_ops = { - .get_temp = int340x_thermal_get_zone_temp, - .get_trip_temp = int340x_thermal_get_trip_temp, - .get_trip_type = int340x_thermal_get_trip_type, ---- a/drivers/thermal/intel_soc_dts_thermal.c -+++ b/drivers/thermal/intel_soc_dts_thermal.c -@@ -270,7 +270,7 @@ static int sys_get_curr_temp(struct ther - return 0; - } - --static struct thermal_zone_device_ops tzone_ops = { -+static const struct thermal_zone_device_ops tzone_ops = { - .get_temp = sys_get_curr_temp, - .get_trip_temp = sys_get_trip_temp, - .get_trip_type = sys_get_trip_type, ---- a/drivers/thermal/kirkwood_thermal.c -+++ b/drivers/thermal/kirkwood_thermal.c -@@ -60,7 +60,7 @@ static int kirkwood_get_temp(struct ther - return 0; - } - --static struct thermal_zone_device_ops ops = { -+static const struct thermal_zone_device_ops ops = { - .get_temp = kirkwood_get_temp, - }; - ---- a/drivers/thermal/of-thermal.c -+++ b/drivers/thermal/of-thermal.c -@@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(stru - return -EINVAL; - } - --static struct thermal_zone_device_ops of_thermal_ops = { -+static const struct thermal_zone_device_ops of_thermal_ops = { - .get_temp = of_thermal_get_temp, - .get_trend = of_thermal_get_trend, - .set_emul_temp = of_thermal_set_emul_temp, ---- a/drivers/thermal/rcar_thermal.c -+++ b/drivers/thermal/rcar_thermal.c -@@ -270,7 +270,7 @@ static int rcar_thermal_notify(struct th - return 0; - } - --static struct thermal_zone_device_ops rcar_thermal_zone_ops = { -+static const struct thermal_zone_device_ops rcar_thermal_zone_ops = { - .get_temp = rcar_thermal_get_temp, - .get_trip_type = rcar_thermal_get_trip_type, - .get_trip_temp = rcar_thermal_get_trip_temp, ---- a/drivers/thermal/spear_thermal.c -+++ b/drivers/thermal/spear_thermal.c -@@ -50,7 +50,7 @@ static inline int thermal_get_temp(struc - return 0; - } - --static struct thermal_zone_device_ops ops = { -+static const struct thermal_zone_device_ops ops = { - .get_temp = thermal_get_temp, - }; - ---- a/drivers/thermal/st/st_thermal.c -+++ b/drivers/thermal/st/st_thermal.c -@@ -175,7 +175,7 @@ static int st_thermal_get_trip_temp(stru - return 0; - } - --static struct thermal_zone_device_ops st_tz_ops = { -+static const struct thermal_zone_device_ops st_tz_ops = { - .get_temp = st_thermal_get_temp, - .get_trip_type = st_thermal_get_trip_type, - .get_trip_temp = st_thermal_get_trip_temp, ---- a/drivers/thermal/thermal_core.c -+++ b/drivers/thermal/thermal_core.c -@@ -1479,7 +1479,7 @@ static void remove_trip_attrs(struct the - */ - struct thermal_zone_device *thermal_zone_device_register(const char *type, - int trips, int mask, void *devdata, -- struct thermal_zone_device_ops *ops, -+ const struct thermal_zone_device_ops *ops, - const struct thermal_zone_params *tzp, - int passive_delay, int polling_delay) - { ---- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c -+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c -@@ -281,7 +281,7 @@ static const struct thermal_zone_of_devi - .get_trend = __ti_thermal_get_trend, - }; - --static struct thermal_zone_device_ops ti_thermal_ops = { -+static const struct thermal_zone_device_ops ti_thermal_ops = { - .get_temp = ti_thermal_get_temp, - .get_trend = ti_thermal_get_trend, - .bind = ti_thermal_bind, ---- a/drivers/thermal/x86_pkg_temp_thermal.c -+++ b/drivers/thermal/x86_pkg_temp_thermal.c -@@ -274,7 +274,7 @@ static int sys_get_trip_type(struct ther - } - - /* Thermal zone callback registry */ --static struct thermal_zone_device_ops tzone_ops = { -+static const struct thermal_zone_device_ops tzone_ops = { - .get_temp = sys_get_curr_temp, - .get_trip_temp = sys_get_trip_temp, - .get_trip_type = sys_get_trip_type, ---- a/include/linux/thermal.h -+++ b/include/linux/thermal.h -@@ -186,7 +186,7 @@ struct thermal_zone_device { - int passive; - unsigned int forced_passive; - atomic_t need_update; -- struct thermal_zone_device_ops *ops; -+ const struct thermal_zone_device_ops *ops; - const struct thermal_zone_params *tzp; - struct thermal_governor *governor; - struct list_head thermal_instances; -@@ -318,7 +318,7 @@ void thermal_zone_of_sensor_unregister(s - - #if IS_ENABLED(CONFIG_THERMAL) - struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, -- void *, struct thermal_zone_device_ops *, -+ void *, const struct thermal_zone_device_ops *, - const struct thermal_zone_params *, int, int); - void thermal_zone_device_unregister(struct thermal_zone_device *); - -@@ -346,7 +346,7 @@ void thermal_notify_framework(struct the - #else - static inline struct thermal_zone_device *thermal_zone_device_register( - const char *type, int trips, int mask, void *devdata, -- struct thermal_zone_device_ops *ops, -+ const struct thermal_zone_device_ops *ops, - const struct thermal_zone_params *tzp, - int passive_delay, int polling_delay) - { return ERR_PTR(-ENODEV); } -- cgit v1.2.3