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


Pavel Machek
 

Hi!

From: Peter Foley <pefoley2@...>

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@...>
[cw00.choi: Modify the patch title and descritpion]
Signed-off-by: Chanwoo Choi <cw00.choi@...>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...>
Thank you, applied to 4.4-cip.

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Pavel Machek
 

Hi!

From: Peter Foley <pefoley2@...>

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@...>
[cw00.choi: Modify the patch title and descritpion]
Signed-off-by: Chanwoo Choi <cw00.choi@...>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...>
---
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;
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Nobuhiro Iwamatsu
 

From: Peter Foley <pefoley2@...>

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@...>
[cw00.choi: Modify the patch title and descritpion]
Signed-off-by: Chanwoo Choi <cw00.choi@...>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@...>
---
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;
--
2.36.1