Skip to contentSkip to conversation

ARM: OMAP2: twl-common: fix compiler warnings

PATCH New Tero Kristo 4 participants 5 messages Jun 28, 2012 – Jul 6, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Tero Kristo

author
#0 lore raw

PATCH 1/1 ARM: OMAP2: twl-common: fix compiler warnings

OMAP2 does not use the external voltage controller code for TWL, and thus OMAP2 only compilation generates following warnings:

arch/arm/mach-omap2/twl-common.c:51: warning: 'twl_set_voltage' defined but not used arch/arm/mach-omap2/twl-common.c:57: warning: 'twl_get_voltage' defined but not used

This patch moves the code in question behind ARCH specific flags and eliminates these warnings.

Reported-by Paul Walmsley <[email protected]>
Signed-off-by Tero Kristo <[email protected]>
---
 arch/arm/mach-omap2/twl-common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/twl-common.c +2 -0
index 119d5a9..5447c13 100644
@@ -48,6 +48,7 @@ static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {
 	},
 };
 
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static int twl_set_voltage(void *data, int target_uV)
 {
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;

@@ -59,6 +60,7 @@ static int twl_get_voltage(void *data)
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;
 	return voltdm_get_voltage(voltdm);
 }
+#endif
 
 void __init omap_pmic_init(int bus, u32 clkrate,
 			   const char *pmic_type, int pmic_irq,
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: OMAP2: twl-common: fix compiler warnings

Quoted 11 lines · Tero Kristo

OMAP2 does not use the external voltage controller code for TWL, and thus OMAP2 only compilation generates following warnings:

arch/arm/mach-omap2/twl-common.c:51: warning: 'twl_set_voltage' defined but not used arch/arm/mach-omap2/twl-common.c:57: warning: 'twl_get_voltage' defined but not used

This patch moves the code in question behind ARCH specific flags and eliminates these warnings.

Reported-by Paul Walmsley <[email protected]>
Signed-off-by Tero Kristo <[email protected]>

Thanks Tero, looks okay to me. I guess Kevin or Tony should queue this one.

- Paul

maintainer
#2 lore raw

PATCH 1/1 ARM: OMAP2: twl-common: fix compiler warnings

In reply to Tero Kristo
Quoted 2 lines · Tero Kristo

OMAP2 does not use the external voltage controller code for TWL, and thus OMAP2 only compilation generates following warnings:

Hmm well omap2420 does not have twl, but 2430 usually has. So do you mean that 2430 does not use the external voltage controller code?

Quoted 5 lines

arch/arm/mach-omap2/twl-common.c:51: warning: 'twl_set_voltage' defined but not used arch/arm/mach-omap2/twl-common.c:57: warning: 'twl_get_voltage' defined but not used

This patch moves the code in question behind ARCH specific flags and eliminates these warnings.

...

Quoted 11 lines
arch/arm/mach-omap2/twl-common.c +1 -0
@@ -48,6 +48,7 @@ static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {
 	},
 };
 
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static int twl_set_voltage(void *data, int target_uV)
 {
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;

arch/arm/mach-omap2/twl-common.c static int twl_get_voltage(void *data) · line 63

Quoted 4 lines
arch/arm/mach-omap2/twl-common.c +1 -0
@@ -59,6 +60,7 @@ static int twl_get_voltage(void *data)
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;
 	return voltdm_get_voltage(voltdm);
 }
+#endif

To avoid patching this piece of code for new SoCs, can we make it ifndef CONFIG_ARCH_OMAP2? Also in the makefile we should not even build twl-common.o for 2420 only builds..

Regards,

Tony

author
#3 lore raw

PATCH 1/1 ARM: OMAP2: twl-common: fix compiler warnings

Quoted 6 lines · Tony Lindgren
Quoted 2 lines · Tero Kristo

OMAP2 does not use the external voltage controller code for TWL, and thus OMAP2 only compilation generates following warnings:

Hmm well omap2420 does not have twl, but 2430 usually has. So do you mean that 2430 does not use the external voltage controller code?

Well, at least currently the external controller code is not used on any omap2xxx chip. I guess it might be possible to extend the support for omap2 also, but I don't know who can do that (personally I have no access to omap2 hw.)

Quoted 14 lines
Quoted 6 lines

arch/arm/mach-omap2/twl-common.c:51: warning: 'twl_set_voltage' defined but not used arch/arm/mach-omap2/twl-common.c:57: warning: 'twl_get_voltage' defined but not used

This patch moves the code in question behind ARCH specific flags and eliminates these warnings.

...

Quoted 6 lines
arch/arm/mach-omap2/twl-common.c +0 -0
@@ -48,6 +48,7 @@ static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {
 	},
 };
Quoted 13 lines

arch/arm/mach-omap2/twl-common.c static int twl_get_voltage(void *data) · line 63

Quoted 9 lines
arch/arm/mach-omap2/twl-common.c +2 -0
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static int twl_set_voltage(void *data, int target_uV)
 {
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;

@@ -59,6 +60,7 @@ static int twl_get_voltage(void *data)
 	struct voltagedomain *voltdm = (struct voltagedomain *)data;
 	return voltdm_get_voltage(voltdm);
 }
+#endif

To avoid patching this piece of code for new SoCs, can we make it ifndef CONFIG_ARCH_OMAP2? Also in the makefile we should not even build twl-common.o for 2420 only builds..

Can't make it ifndef CONFIG_ARCH_OMAP2, as this would break on omap2plus_defconfig then... as it defines all ARCH_OMAP2...ARCH_OMAP4.

And... can't drop it from makefile either, as parts of the code from twl-common.c are still used with omap2 (omap_pmic_init & omap_pmic_late_init). These would need to be moved elsewhere first.

-Tero

#4 lore raw

PATCH 1/1 ARM: OMAP2: twl-common: fix compiler warnings

In reply to Tero Kristo

Hi Tero,

Quoted 11 lines · Tero Kristo

OMAP2 does not use the external voltage controller code for TWL, and thus OMAP2 only compilation generates following warnings:

arch/arm/mach-omap2/twl-common.c:51: warning: 'twl_set_voltage' defined but not used arch/arm/mach-omap2/twl-common.c:57: warning: 'twl_get_voltage' defined but not used

This patch moves the code in question behind ARCH specific flags and eliminates these warnings.

Reported-by Paul Walmsley <[email protected]>
Signed-off-by Tero Kristo <[email protected]>

I did sent similar patch:
http://www.mail-archive.com/[email protected]/msg70432.html

Tony applied it to fixes I think already.

Signature · 7 lines
Péter


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html