On Thu, Mar 26, 2015 at 04:53:58PM +0100, Sascha Hauer wrote: > Now that we no longer modify the ops they can be const again. Also > we no longer have to duplicate them. > > Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
Should this one be merged to patch 09/13?
> ---
> drivers/thermal/of-thermal.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> index df14fdd..9b63193 100644
> --- a/drivers/thermal/of-thermal.c
> +++ b/drivers/thermal/of-thermal.c
> @@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(struct
> thermal_zone_device *tz,
> 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,
> @@ -539,10 +539,6 @@ void thermal_zone_of_sensor_unregister(struct device
> *dev,
> return;
>
> mutex_lock(&tzd->lock);
> - tzd->ops->get_temp = NULL;
> - tzd->ops->get_trend = NULL;
> - tzd->ops->set_emul_temp = NULL;
> -
> tz->ops = NULL;
> tz->sensor_data = NULL;
> mutex_unlock(&tzd->lock);
> @@ -849,7 +845,6 @@ int __init of_parse_thermal_zones(void)
> {
> struct device_node *np, *child;
> struct __thermal_zone *tz;
> - struct thermal_zone_device_ops *ops;
>
> np = of_find_node_by_name(NULL, "thermal-zones");
> if (!np) {
> @@ -873,29 +868,22 @@ int __init of_parse_thermal_zones(void)
> continue;
> }
>
> - ops = kmemdup(&of_thermal_ops, sizeof(*ops), GFP_KERNEL);
> - if (!ops)
> - goto exit_free;
> -
> tzp = kzalloc(sizeof(*tzp), GFP_KERNEL);
> - if (!tzp) {
> - kfree(ops);
> + if (!tzp)
> goto exit_free;
> - }
>
> /* No hwmon because there might be hwmon drivers registering */
> tzp->no_hwmon = true;
>
> zone = thermal_zone_device_register(child->name, tz->ntrips,
> 0, tz,
> - ops, tzp,
> + &of_thermal_ops, tzp,
> tz->passive_delay,
> tz->polling_delay);
> if (IS_ERR(zone)) {
> pr_err("Failed to build %s zone %ld\n", child->name,
> PTR_ERR(zone));
> kfree(tzp);
> - kfree(ops);
> of_thermal_free_zone(tz);
> /* attempting to build remaining zones still */
> }
> --
> 2.1.4
>
signature.asc
Description: Digital signature
