Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1299710

Re: linux-next: build failure after merge of the thermal-soc tree

Show all headers | View raw

On Thu, 2015-12-31 at 12:53 +1100, Stephen Rothwell wrote:
> Hi Eduardo,
> 
> After merging the thermal-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/thermal/thermal_core.c: In function 'trip_point_temp_store':
> drivers/thermal/thermal_core.c:764:2: error: too few arguments to
> function 'thermal_zone_device_update'
>   thermal_zone_device_update(tz);   
>   ^
> drivers/thermal/thermal_core.c:612:6: note: declared here
>  void thermal_zone_device_update(struct thermal_zone_device *tz,
>       ^
> 
> Caused by commit
> 
>   ce0265dd6f8e ("thermal: trip_point_temp_store() calls
> thermal_zone_device_update()")
> 
> from the thermal-soc tree interacting with commit
> 
>   c4117cc3526e ("thermal: core: enhance thermal_zone_device_update")
> 
> from the thermal tree.
> 
> I have applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 31 Dec 2015 12:47:22 +1100
> Subject: [PATCH] thermal: fix for thermal_zone_device_update() API
> change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/thermal/thermal_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/thermal_core.c
> b/drivers/thermal/thermal_core.c
> index bd175218141f..7f7a3caf8892 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -761,7 +761,7 @@ trip_point_temp_store(struct device *dev, struct
> device_attribute *attr,
>  	if (ret)
>  		return ret;
>  
> -	thermal_zone_device_update(tz);
> +	thermal_zone_device_update(tz, THERMAL_DEVICE_EVENT_NONE);

This fix looks good to me.

Thanks,
Srinivas

>  
>  	return count;
>  }
> -- 
> 2.6.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the thermal-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 03:00 +0100
  Re: linux-next: build failure after merge of the thermal-soc tree Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> - 2015-12-31 18:10 +0100

csiph-web