diff mbox series

[RESEND,for,4.4.y] extcon: adc-jack: Fix incompatible pointer type warning

Message ID 20221201001903.1695510-1-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive)
State Accepted
Delegated to: Pavel Machek
Headers show
Series [RESEND,for,4.4.y] extcon: adc-jack: Fix incompatible pointer type warning | expand

Commit Message

Nobuhiro Iwamatsu Dec. 1, 2022, 12:19 a.m. UTC
From: Peter Foley <pefoley2@pefoley.com>

commit 8a522bf2d4f788306443d36b26b54f0aedcdfdbe upstream.

This patch fixes the incompatible warning of extcon-adc-jack.c driver
when calling devm_extcon_dev_allocate().

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
[cw00.choi: Modify the patch title and descritpion]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 include/linux/extcon/extcon-adc-jack.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pavel Machek Dec. 1, 2022, 9:10 a.m. UTC | #1
Hi!

> From: Peter Foley <pefoley2@pefoley.com>
> 
> commit 8a522bf2d4f788306443d36b26b54f0aedcdfdbe upstream.
> 
> This patch fixes the incompatible warning of extcon-adc-jack.c driver
> when calling devm_extcon_dev_allocate().

So AFAICT:

This is not applicable to 4.4-st.

This problem exists in both 4.4-cip and 4.4-cip-rt, but our testing
only discovered it in -cip-rt variant.

I can apply it to 4.4-cip if that's okay with everyone.

Thanks and best regards,
								Pavel
								
> Signed-off-by: Peter Foley <pefoley2@pefoley.com>
> [cw00.choi: Modify the patch title and descritpion]
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  include/linux/extcon/extcon-adc-jack.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h
> index 53c60806bcfb6d..373b76a90ed41c 100644
> --- a/include/linux/extcon/extcon-adc-jack.h
> +++ b/include/linux/extcon/extcon-adc-jack.h
> @@ -58,7 +58,7 @@ struct adc_jack_pdata {
>  	const char *name;
>  	const char *consumer_channel;
>  
> -	const enum extcon *cable_names;
> +	const unsigned int *cable_names;
>  
>  	/* The last entry's state should be 0 */
>  	struct adc_jack_cond *adc_conditions;
Pavel Machek Dec. 2, 2022, 10:33 a.m. UTC | #2
Hi!

> From: Peter Foley <pefoley2@pefoley.com>
> 
> commit 8a522bf2d4f788306443d36b26b54f0aedcdfdbe upstream.
> 
> This patch fixes the incompatible warning of extcon-adc-jack.c driver
> when calling devm_extcon_dev_allocate().
> 
> Signed-off-by: Peter Foley <pefoley2@pefoley.com>
> [cw00.choi: Modify the patch title and descritpion]
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>

Thank you, applied to 4.4-cip.

Best regards,
								Pavel
diff mbox series

Patch

diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h
index 53c60806bcfb6d..373b76a90ed41c 100644
--- a/include/linux/extcon/extcon-adc-jack.h
+++ b/include/linux/extcon/extcon-adc-jack.h
@@ -58,7 +58,7 @@  struct adc_jack_pdata {
 	const char *name;
 	const char *consumer_channel;
 
-	const enum extcon *cable_names;
+	const unsigned int *cable_names;
 
 	/* The last entry's state should be 0 */
 	struct adc_jack_cond *adc_conditions;