LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: build failure after merge of the thermal-soc tree
@ 2015-03-04  7:06 Stephen Rothwell
  2015-03-04 19:01 ` Eduardo Valentin
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-03-04  7:06 UTC (permalink / raw)
  To: Eduardo Valentin; +Cc: linux-next, linux-kernel, Javi Merino

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

Hi Eduardo,

After merging the thermal-soc tree, today's linux-next build (arm
cm_x2xx_defconfig (at least)) failed like this:

include/linux/thermal.h:408:38: error: parameter name omitted
include/linux/thermal.h:413:1: error: expected identifier or '(' before '{' token

Caused by commit ddd4dd8ddf78 ("thermal: extend the cooling device API
to include power information").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the thermal-soc tree
  2015-03-04  7:06 linux-next: build failure after merge of the thermal-soc tree Stephen Rothwell
@ 2015-03-04 19:01 ` Eduardo Valentin
  0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Valentin @ 2015-03-04 19:01 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Javi Merino

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

Hi Stephen,

On Wed, Mar 04, 2015 at 06:06:36PM +1100, Stephen Rothwell wrote:
> Hi Eduardo,
> 
> After merging the thermal-soc tree, today's linux-next build (arm
> cm_x2xx_defconfig (at least)) failed like this:
> 
> include/linux/thermal.h:408:38: error: parameter name omitted
> include/linux/thermal.h:413:1: error: expected identifier or '(' before '{' token
> 
> Caused by commit ddd4dd8ddf78 ("thermal: extend the cooling device API
> to include power information").
> 

Thanks for pointing it out. Javi has already provided a fix and I
already added in my -linus branch. I will appear in your next linux-next
build.

BR,

Eduardo Valentin

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the thermal-soc tree
  2019-05-13  1:02 Stephen Rothwell
@ 2019-05-13 15:57 ` Guenter Roeck
  0 siblings, 0 replies; 9+ messages in thread
From: Guenter Roeck @ 2019-05-13 15:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Eduardo Valentin, Linux Next Mailing List, Linux Kernel Mailing List

On Mon, May 13, 2019 at 11:02:44AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the thermal-soc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ld: drivers/infiniband/hw/cxgb4/cm.o: in function `.devm_thermal_of_cooling_device_register':
> (.text+0x23f0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
> ld: drivers/infiniband/hw/cxgb4/cm.o:(.opd+0x2e8): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here

[...]

> @@ -508,7 +508,7 @@ static inline struct thermal_cooling_device *
>  thermal_of_cooling_device_register(struct device_node *np,
>  	char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
>  { return ERR_PTR(-ENODEV); }
> -struct thermal_cooling_device *
> +static inline struct thermal_cooling_device *
>  devm_thermal_of_cooling_device_register(struct device *dev,
>  				struct device_node *np,
>  				char *type, void *devdata,

Ah, I had wondered where that was coming from. Eduardo, can you pick up the
fix, or even better merge it into the original patch ?

Thanks,
Guenter

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the thermal-soc tree
@ 2019-05-13  1:02 Stephen Rothwell
  2019-05-13 15:57 ` Guenter Roeck
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2019-05-13  1:02 UTC (permalink / raw)
  To: Eduardo Valentin
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Guenter Roeck

[-- Attachment #1: Type: text/plain, Size: 14047 bytes --]

Hi all,

After merging the thermal-soc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ld: drivers/infiniband/hw/cxgb4/cm.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x23f0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/cm.o:(.opd+0x2e8): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/provider.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0xf90): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/provider.o:(.opd+0x198): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/mem.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x11c0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/mem.o:(.opd+0xa8): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/cq.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1750): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/cq.o:(.opd+0x90): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/qp.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1550): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/qp.o:(.opd+0x108): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/resource.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/resource.o:(.opd+0x0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/ev.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/ev.o:(.opd+0x18): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/id_table.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/id_table.o:(.opd+0x0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/infiniband/hw/cxgb4/restrack.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1590): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.text+0x28c0): first defined here
ld: drivers/infiniband/hw/cxgb4/restrack.o:(.opd+0xc0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/infiniband/hw/cxgb4/device.o:(.opd+0x198): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/l2t.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1220): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/l2t.o:(.opd+0x120): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/smt.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x4d0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/smt.o:(.opd+0x30): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/t4_hw.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x21f0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/t4_hw.o:(.opd+0x198): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/sge.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x3a60): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/sge.o:(.opd+0x270): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/clip_tbl.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x990): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/clip_tbl.o:(.opd+0x90): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x2f80): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.o:(.opd+0x390): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1f60): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.o:(.opd+0x138): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/srq.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1b0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/srq.o:(.opd+0x18): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/sched.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x250): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/sched.o:(.opd+0x18): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0xf10): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.o:(.opd+0xc0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x430): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.o:(.opd+0x198): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x570): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.o:(.opd+0x78): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x9a0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.o:(.opd+0x78): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0xb00): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.o:(.opd+0x30): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_common.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_common.o:(.opd+0x0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x1ae0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.o:(.opd+0xd8): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0x0): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.o:(.opd+0x0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.o: in function `.devm_thermal_of_cooling_device_register':
(.text+0xed00): multiple definition of `.devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.text+0x79a0): first defined here
ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.o:(.opd+0x8d0): multiple definition of `devm_thermal_of_cooling_device_register'; drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o:(.opd+0x708): first defined here

Caused by commit

  4e211e068ae9 ("thermal: Introduce devm_thermal_of_cooling_device_register")

I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 May 2019 10:55:00 +1000
Subject: [PATCH] thermal: use "static inline" for stub function

Fixes: 4e211e068ae9 ("thermal: Introduce devm_thermal_of_cooling_device_register")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/thermal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 6f78fa9238da..15a4ca5d7099 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -508,7 +508,7 @@ static inline struct thermal_cooling_device *
 thermal_of_cooling_device_register(struct device_node *np,
 	char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
 { return ERR_PTR(-ENODEV); }
-struct thermal_cooling_device *
+static inline struct thermal_cooling_device *
 devm_thermal_of_cooling_device_register(struct device *dev,
 				struct device_node *np,
 				char *type, void *devdata,
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the thermal-soc tree
  2015-12-31  1:53 Stephen Rothwell
@ 2015-12-31 17:01 ` Srinivas Pandruvada
  0 siblings, 0 replies; 9+ messages in thread
From: Srinivas Pandruvada @ 2015-12-31 17:01 UTC (permalink / raw)
  To: Stephen Rothwell, Eduardo Valentin, Zhang Rui
  Cc: linux-next, linux-kernel, Kuninori Morimoto

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
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the thermal-soc tree
@ 2015-12-31  1:53 Stephen Rothwell
  2015-12-31 17:01 ` Srinivas Pandruvada
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-12-31  1:53 UTC (permalink / raw)
  To: Eduardo Valentin, Zhang Rui
  Cc: linux-next, linux-kernel, Srinivas Pandruvada, Kuninori Morimoto

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);
 
 	return count;
 }
-- 
2.6.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the thermal-soc tree
  2015-11-05 10:22 ` Caesar Wang
@ 2015-11-09 19:17   ` Eduardo Valentin
  0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Valentin @ 2015-11-09 19:17 UTC (permalink / raw)
  To: Caesar Wang; +Cc: Stephen Rothwell, linux-next, linux-kernel

Stephen,

On Thu, Nov 05, 2015 at 06:22:00PM +0800, Caesar Wang wrote:
> 
> 
> 在 2015年11月05日 13:01, Stephen Rothwell 写道:
> >Hi Eduardo,
> >
> >After merging the thermal-soc tree, today's linux-next build (powerpc
> >allyesconfig) failed like this:
> >
> >drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_suspend':
> >drivers/thermal/rockchip_thermal.c:641:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
> >   pinctrl_pm_select_sleep_state(dev);
> >   ^
> >drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_resume':
> >drivers/thermal/rockchip_thermal.c:679:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
> >   pinctrl_pm_select_default_state(dev);
> >   ^
> 

Thanks, I wonder why I did not catch this in my bots.

> That's indeed wonder that I build up in next-kernel-v4.3, applied
> into chromium v3.14 stable kernel.
> 
> from the log I guess wee need the include file:
> "#include <linux/pinctrl/consumer.h>"

Caesar, are you sending a patch or should I just take care of it?

BR,

> 
> 
> >
> >Caused by commit
> >
> >   7e38a5b1daa1 ("thermal: rockchip: support the sleep pinctrl state to avoid glitches")
> >
> >Probably just a missing include file.
> >
> >I have reverted that commit for today.
> >
> >
> >
> 
> -- 
> Yours,
> Caesar
> 
> 
> --
> 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/

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the thermal-soc tree
  2015-11-05  5:01 Stephen Rothwell
@ 2015-11-05 10:22 ` Caesar Wang
  2015-11-09 19:17   ` Eduardo Valentin
  0 siblings, 1 reply; 9+ messages in thread
From: Caesar Wang @ 2015-11-05 10:22 UTC (permalink / raw)
  To: Stephen Rothwell, Eduardo Valentin; +Cc: linux-next, linux-kernel



在 2015年11月05日 13:01, Stephen Rothwell 写道:
> Hi Eduardo,
>
> After merging the thermal-soc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_suspend':
> drivers/thermal/rockchip_thermal.c:641:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
>    pinctrl_pm_select_sleep_state(dev);
>    ^
> drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_resume':
> drivers/thermal/rockchip_thermal.c:679:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
>    pinctrl_pm_select_default_state(dev);
>    ^

That's indeed wonder that I build up in next-kernel-v4.3, applied into 
chromium v3.14 stable kernel.

from the log I guess wee need the include file:
"#include <linux/pinctrl/consumer.h>"


>
> Caused by commit
>
>    7e38a5b1daa1 ("thermal: rockchip: support the sleep pinctrl state to avoid glitches")
>
> Probably just a missing include file.
>
> I have reverted that commit for today.
>
>
>

-- 
Yours,
Caesar



^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the thermal-soc tree
@ 2015-11-05  5:01 Stephen Rothwell
  2015-11-05 10:22 ` Caesar Wang
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-11-05  5:01 UTC (permalink / raw)
  To: Eduardo Valentin; +Cc: linux-next, linux-kernel, Caesar Wang

Hi Eduardo,

After merging the thermal-soc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_suspend':
drivers/thermal/rockchip_thermal.c:641:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
  pinctrl_pm_select_sleep_state(dev);
  ^
drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_resume':
drivers/thermal/rockchip_thermal.c:679:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
  pinctrl_pm_select_default_state(dev);
  ^

Caused by commit

  7e38a5b1daa1 ("thermal: rockchip: support the sleep pinctrl state to avoid glitches")

Probably just a missing include file.

I have reverted that commit for today.



-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-05-13 15:57 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-04  7:06 linux-next: build failure after merge of the thermal-soc tree Stephen Rothwell
2015-03-04 19:01 ` Eduardo Valentin
2015-11-05  5:01 Stephen Rothwell
2015-11-05 10:22 ` Caesar Wang
2015-11-09 19:17   ` Eduardo Valentin
2015-12-31  1:53 Stephen Rothwell
2015-12-31 17:01 ` Srinivas Pandruvada
2019-05-13  1:02 Stephen Rothwell
2019-05-13 15:57 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).