Patchwork ARM: OMAP2: twl-common: Fix compiler warning

login
register
mail settings
Submitter Péter Ujfalusi
Date June 15, 2012, 1:33 p.m.
Message ID <1339767234-25323-1-git-send-email-peter.ujfalusi@ti.com>
Download mbox | patch
Permalink /patch/165117/
State New
Headers show

Comments

Péter Ujfalusi - June 15, 2012, 1:33 p.m.
If the kernel is built only for OMAP2 the following warning will show up:

arch/arm/mach-omap2/twl-common.c:52: warning: ‘twl_set_voltage’ defined but not used
arch/arm/mach-omap2/twl-common.c:58: warning: ‘twl_get_voltage’ defined but not used

The twl_set/get_voltage callbacks only used when OMAP3/4 is selected.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/twl-common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Tony Lindgren - June 20, 2012, 2:25 p.m.
* Peter Ujfalusi <peter.ujfalusi@ti.com> [120615 06:38]:
> If the kernel is built only for OMAP2 the following warning will show up:
> 
> arch/arm/mach-omap2/twl-common.c:52: warning: ‘twl_set_voltage’ defined but not used
> arch/arm/mach-omap2/twl-common.c:58: warning: ‘twl_get_voltage’ defined but not used
> 
> The twl_set/get_voltage callbacks only used when OMAP3/4 is selected.

Thanks applying into fixes.

Tony

> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  arch/arm/mach-omap2/twl-common.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
> index 119d5a9..5447c13 100644
> --- a/arch/arm/mach-omap2/twl-common.c
> +++ b/arch/arm/mach-omap2/twl-common.c
> @@ -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,
> -- 
> 1.7.8.6
>

Patch

diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index 119d5a9..5447c13 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -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,