[PATCH 1/4] davinci: fix warning in arch/arm/mach-davinci/usb.c

[Nori, Sekhar]

commit 608ce6bce60bdb3b459e109cba374be30975039f (DA8xx: MUSB
platform device registration) introduced the following warning
when USB is not configured in and DA8XX is configured.

arch/arm/mach-davinci/usb.c:138: warning: no return statement in
function returning non-void

This patch fixes the warning.

Signed-off-by: Sekhar Nori <[hidden email]>
---
The entire series has been boot tested on DA850 and
DM6467 EVMs.

 arch/arm/mach-davinci/usb.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index c684d95..31f0cbe 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -135,6 +135,7 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
 #ifdef CONFIG_ARCH_DAVINCI_DA8XX
 int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
 {
+ return 0;
 }
 #endif
 
--
1.6.2.4

[Nori, Sekhar]

The commit 6cfabebf45e43cbcf87361cef70e3963eb6d38b4 (davinci:
DA850/OMAP-L138: avoid using separate initcall for initializing
regulator) introduced a section mismatch in da850_regulator_init()

This patch fixes the warning.

Signed-off-by: Sekhar Nori <[hidden email]>
---
 arch/arm/mach-davinci/da850.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4644618..717806c 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -922,7 +922,7 @@ static int da850_set_voltage(unsigned int index)
  return regulator_set_voltage(cvdd, opp->cvdd_min, opp->cvdd_max);
 }
 
-static int __init da850_regulator_init(void)
+static int da850_regulator_init(void)
 {
  cvdd = regulator_get(NULL, "cvdd");
  if (WARN(IS_ERR(cvdd), "Unable to obtain voltage regulator for CVDD;"
--
1.6.2.4

[Nori, Sekhar]

A section mismatch is reported for gpio_led_platform_data
as it is referenced by a non annotated function (evm_led_setup)

This patch fixes the issue by converting the __initconst to const
as is the case in arch/arm/mach-davinci/board-dm644x-evm.c file.

Signed-off-by: Sekhar Nori <[hidden email]>
---
 arch/arm/mach-davinci/board-dm646x-evm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 75b2b6f..8d0b0e0 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -194,7 +194,7 @@ static struct gpio_led evm_leds[] = {
  { .name = "DS4", .active_low = 1, },
 };
 
-static __initconst struct gpio_led_platform_data evm_led_data = {
+static const struct gpio_led_platform_data evm_led_data = {
  .num_leds = ARRAY_SIZE(evm_leds),
  .leds     = evm_leds,
 };
--
1.6.2.4

[Nori, Sekhar]

This patch fixes the following warning:

arch/arm/mach-davinci/board-sffsdr.c:99: warning: 'sffsdr_emac_pdata' defined but not used

Signed-off-by: Sekhar Nori <[hidden email]>
---
 arch/arm/mach-davinci/board-sffsdr.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index ccfd85b..08d373b 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -96,11 +96,6 @@ static struct platform_device davinci_sffsdr_nandflash_device = {
  .resource = davinci_sffsdr_nandflash_resource,
 };
 
-static struct emac_platform_data sffsdr_emac_pdata = {
- .phy_mask = SFFSDR_PHY_MASK,
- .mdio_max_freq = SFFSDR_MDIO_FREQUENCY,
-};
-
 static struct at24_platform_data eeprom_info = {
  .byte_len = (64*1024) / 8,
  .page_size = 32,
--
1.6.2.4

[Kevin Hilman]

Sekhar Nori <[hidden email]> writes:

> commit 608ce6bce60bdb3b459e109cba374be30975039f (DA8xx: MUSB
> platform device registration) introduced the following warning
> when USB is not configured in and DA8XX is configured.
>
> arch/arm/mach-davinci/usb.c:138: warning: no return statement in
> function returning non-void
>
> This patch fixes the warning.
>
> Signed-off-by: Sekhar Nori <[hidden email]>

Thanks, I folded this one into original commit adding to the changelog
for your fixup.

Kevin

> ---
> The entire series has been boot tested on DA850 and
> DM6467 EVMs.
>
>  arch/arm/mach-davinci/usb.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index c684d95..31f0cbe 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -135,6 +135,7 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
>  #ifdef CONFIG_ARCH_DAVINCI_DA8XX
>  int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
>  {
> + return 0;
>  }
>  #endif
>  
> --
> 1.6.2.4
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[Kevin Hilman]

Sekhar Nori <[hidden email]> writes:

> The commit 6cfabebf45e43cbcf87361cef70e3963eb6d38b4 (davinci:
> DA850/OMAP-L138: avoid using separate initcall for initializing
> regulator) introduced a section mismatch in da850_regulator_init()
>
> This patch fixes the warning.
>
> Signed-off-by: Sekhar Nori <[hidden email]>

Thanks, folded into original commit in davinci-next.

Kevin

> ---
>  arch/arm/mach-davinci/da850.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
> index 4644618..717806c 100644
> --- a/arch/arm/mach-davinci/da850.c
> +++ b/arch/arm/mach-davinci/da850.c
> @@ -922,7 +922,7 @@ static int da850_set_voltage(unsigned int index)
>   return regulator_set_voltage(cvdd, opp->cvdd_min, opp->cvdd_max);
>  }
>  
> -static int __init da850_regulator_init(void)
> +static int da850_regulator_init(void)
>  {
>   cvdd = regulator_get(NULL, "cvdd");
>   if (WARN(IS_ERR(cvdd), "Unable to obtain voltage regulator for CVDD;"
> --
> 1.6.2.4
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[Kevin Hilman]

Sekhar Nori <[hidden email]> writes:

> A section mismatch is reported for gpio_led_platform_data
> as it is referenced by a non annotated function (evm_led_setup)
>
> This patch fixes the issue by converting the __initconst to const
> as is the case in arch/arm/mach-davinci/board-dm644x-evm.c file.
>
> Signed-off-by: Sekhar Nori <[hidden email]>

Thanks, pushing to davinci-next.

Kevin

> ---
>  arch/arm/mach-davinci/board-dm646x-evm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 75b2b6f..8d0b0e0 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -194,7 +194,7 @@ static struct gpio_led evm_leds[] = {
>   { .name = "DS4", .active_low = 1, },
>  };
>  
> -static __initconst struct gpio_led_platform_data evm_led_data = {
> +static const struct gpio_led_platform_data evm_led_data = {
>   .num_leds = ARRAY_SIZE(evm_leds),
>   .leds     = evm_leds,
>  };
> --
> 1.6.2.4
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[Kevin Hilman]

Sekhar Nori <[hidden email]> writes:

> This patch fixes the following warning:
>
> arch/arm/mach-davinci/board-sffsdr.c:99: warning: 'sffsdr_emac_pdata' defined but not used
>
> Signed-off-by: Sekhar Nori <[hidden email]>

Thanks, pushing to davinci-next.

Kevin

> ---
>  arch/arm/mach-davinci/board-sffsdr.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index ccfd85b..08d373b 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -96,11 +96,6 @@ static struct platform_device davinci_sffsdr_nandflash_device = {
>   .resource = davinci_sffsdr_nandflash_resource,
>  };
>  
> -static struct emac_platform_data sffsdr_emac_pdata = {
> - .phy_mask = SFFSDR_PHY_MASK,
> - .mdio_max_freq = SFFSDR_MDIO_FREQUENCY,
> -};
> -
>  static struct at24_platform_data eeprom_info = {
>   .byte_len = (64*1024) / 8,
>   .page_size = 32,
> --
> 1.6.2.4
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source