Patchwork [U-Boot] mx6qarm2: fix build error for board_mmc_getcd()

login
register
mail settings
Submitter prabhakar.csengg@gmail.com
Date Feb. 6, 2012, 12:54 p.m.
Message ID <1328532854-21510-1-git-send-email-prabhakar.csengg@gmail.com>
Download mbox | patch
Permalink /patch/139726/
State Rejected
Headers show

Comments

prabhakar.csengg@gmail.com - Feb. 6, 2012, 12:54 p.m.
Fix build error for mx6qarm2 board due to prototype change
for function  board_mmc_getcd().
mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here

Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
---
 board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Dirk Behme - Feb. 6, 2012, 1 p.m.
On 06.02.2012 13:54, Prabhakar Lad wrote:
> Fix build error for mx6qarm2 board due to prototype change
> for function  board_mmc_getcd().
> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here
> 
> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
> ---
>  board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
> index 9894245..2cb37dd 100644
> --- a/board/freescale/mx6qarm2/mx6qarm2.c
> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
>  	{USDHC4_BASE_ADDR, 1},
>  };
>  
> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> +int board_mmc_getcd(struct mmc *mmc)
>  {
>  	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
> +	int ret = 0;
>  
>  	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
>  		gpio_direction_input(171); /*GPIO6_11*/
> -		*cd = gpio_get_value(171);
> -	} else /* Don't have the CD GPIO pin on board */
> -		*cd = 0;
> +		ret = !gpio_get_value(171);
> +	}
>  
> -	return 0;
> +	return ret;
>  }
>  
>  int board_mmc_init(bd_t *bis)

This should be fixed already at u-boot-imx.git:

http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commitdiff;h=e669db1c209eed02ca8c837914c161f5daa2d8fd

Please check.

Best regards

Dirk
prabhakar.csengg@gmail.com - Feb. 6, 2012, 1:07 p.m.
Dirk,

My bad didn't notice it.

WBR,
--Prabhakar Lad

On Mon, Feb 6, 2012 at 6:30 PM, Dirk Behme <dirk.behme@de.bosch.com> wrote:

> On 06.02.2012 13:54, Prabhakar Lad wrote:
>
>> Fix build error for mx6qarm2 board due to prototype change
>> for function  board_mmc_getcd().
>> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
>> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd'
>> was here
>>
>> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
>> ---
>>  board/freescale/mx6qarm2/**mx6qarm2.c |   10 +++++-----
>>  1 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/board/freescale/mx6qarm2/**mx6qarm2.c
>> b/board/freescale/mx6qarm2/**mx6qarm2.c
>> index 9894245..2cb37dd 100644
>> --- a/board/freescale/mx6qarm2/**mx6qarm2.c
>> +++ b/board/freescale/mx6qarm2/**mx6qarm2.c
>> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
>>        {USDHC4_BASE_ADDR, 1},
>>  };
>>  -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
>> +int board_mmc_getcd(struct mmc *mmc)
>>  {
>>        struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
>> +       int ret = 0;
>>        if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
>>                gpio_direction_input(171); /*GPIO6_11*/
>> -               *cd = gpio_get_value(171);
>> -       } else /* Don't have the CD GPIO pin on board */
>> -               *cd = 0;
>> +               ret = !gpio_get_value(171);
>> +       }
>>  -      return 0;
>> +       return ret;
>>  }
>>  int board_mmc_init(bd_t *bis)
>>
>
> This should be fixed already at u-boot-imx.git:
>
> http://git.denx.de/?p=u-boot/**u-boot-imx.git;a=commitdiff;h=**
> e669db1c209eed02ca8c837914c161**f5daa2d8fd<http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commitdiff;h=e669db1c209eed02ca8c837914c161f5daa2d8fd>
>
> Please check.
>
> Best regards
>
> Dirk
>
Thierry Reding - Feb. 6, 2012, 1:39 p.m.
* Prabhakar Lad wrote:
> Fix build error for mx6qarm2 board due to prototype change
> for function  board_mmc_getcd().
> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here
> 
> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
> ---
>  board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
> index 9894245..2cb37dd 100644
> --- a/board/freescale/mx6qarm2/mx6qarm2.c
> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
>  	{USDHC4_BASE_ADDR, 1},
>  };
>  
> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> +int board_mmc_getcd(struct mmc *mmc)
>  {
>  	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
> +	int ret = 0;
>  
>  	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
>  		gpio_direction_input(171); /*GPIO6_11*/
                                           ^^^^^^^^^^^^
Could you fix up this comment at the same time (put spaces after /* and
before */)?

> -		*cd = gpio_get_value(171);
> -	} else /* Don't have the CD GPIO pin on board */
> -		*cd = 0;
> +		ret = !gpio_get_value(171);
> +	}
>  
> -	return 0;
> +	return ret;
>  }

Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
prabhakar.csengg@gmail.com - Feb. 6, 2012, 2:03 p.m.
Thierry,

On 2/6/12, Thierry Reding <thierry.reding@avionic-design.de> wrote:
> * Prabhakar Lad wrote:
>> Fix build error for mx6qarm2 board due to prototype change
>> for function  board_mmc_getcd().
>> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
>> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd'
>> was here
>>
>> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
>> ---
>>  board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
>>  1 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c
>> b/board/freescale/mx6qarm2/mx6qarm2.c
>> index 9894245..2cb37dd 100644
>> --- a/board/freescale/mx6qarm2/mx6qarm2.c
>> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
>> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
>>  	{USDHC4_BASE_ADDR, 1},
>>  };
>>
>> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
>> +int board_mmc_getcd(struct mmc *mmc)
>>  {
>>  	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
>> +	int ret = 0;
>>
>>  	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
>>  		gpio_direction_input(171); /*GPIO6_11*/
>                                            ^^^^^^^^^^^^
> Could you fix up this comment at the same time (put spaces after /* and
> before */)?
>
The patch for this fix already submitted, shall submit independent
patch with this fix?

WBR,
--Prabhakar Lad

>> -		*cd = gpio_get_value(171);
>> -	} else /* Don't have the CD GPIO pin on board */
>> -		*cd = 0;
>> +		ret = !gpio_get_value(171);
>> +	}
>>
>> -	return 0;
>> +	return ret;
>>  }
>
> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
>
Thierry Reding - Feb. 6, 2012, 2:14 p.m.
* Prabhakar Lad wrote:
> Thierry,
> 
> On 2/6/12, Thierry Reding <thierry.reding@avionic-design.de> wrote:
> > * Prabhakar Lad wrote:
> >> Fix build error for mx6qarm2 board due to prototype change
> >> for function  board_mmc_getcd().
> >> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
> >> u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd'
> >> was here
> >>
> >> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
> >> ---
> >>  board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
> >>  1 files changed, 5 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c
> >> b/board/freescale/mx6qarm2/mx6qarm2.c
> >> index 9894245..2cb37dd 100644
> >> --- a/board/freescale/mx6qarm2/mx6qarm2.c
> >> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
> >> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
> >>  	{USDHC4_BASE_ADDR, 1},
> >>  };
> >>
> >> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> >> +int board_mmc_getcd(struct mmc *mmc)
> >>  {
> >>  	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
> >> +	int ret = 0;
> >>
> >>  	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
> >>  		gpio_direction_input(171); /*GPIO6_11*/
> >                                            ^^^^^^^^^^^^
> > Could you fix up this comment at the same time (put spaces after /* and
> > before */)?
> >
> The patch for this fix already submitted, shall submit independent
> patch with this fix?

If it hasn't been applied to any of the upstream repositories yet, then you
can always send an updated version.

Thierry
prabhakar.csengg@gmail.com - Feb. 7, 2012, 5 a.m.
Thierry,

On Mon, Feb 6, 2012 at 7:44 PM, Thierry Reding <
thierry.reding@avionic-design.de> wrote:

> * Prabhakar Lad wrote:
> > Thierry,
> >
> > On 2/6/12, Thierry Reding <thierry.reding@avionic-design.de> wrote:
> > > * Prabhakar Lad wrote:
> > >> Fix build error for mx6qarm2 board due to prototype change
> > >> for function  board_mmc_getcd().
> > >> mx6qarm2.c:123: error: conflicting types for 'board_mmc_getcd'
> > >> u-boot/include/mmc.h:318: note: previous declaration of
> 'board_mmc_getcd'
> > >> was here
> > >>
> > >> Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
> > >> ---
> > >>  board/freescale/mx6qarm2/mx6qarm2.c |   10 +++++-----
> > >>  1 files changed, 5 insertions(+), 5 deletions(-)
> > >>
> > >> diff --git a/board/freescale/mx6qarm2/mx6qarm2.c
> > >> b/board/freescale/mx6qarm2/mx6qarm2.c
> > >> index 9894245..2cb37dd 100644
> > >> --- a/board/freescale/mx6qarm2/mx6qarm2.c
> > >> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
> > >> @@ -120,17 +120,17 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
> > >>    {USDHC4_BASE_ADDR, 1},
> > >>  };
> > >>
> > >> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> > >> +int board_mmc_getcd(struct mmc *mmc)
> > >>  {
> > >>    struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
> > >> +  int ret = 0;
> > >>
> > >>    if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
> > >>            gpio_direction_input(171); /*GPIO6_11*/
> > >                                            ^^^^^^^^^^^^
> > > Could you fix up this comment at the same time (put spaces after /* and
> > > before */)?
> > >
> > The patch for this fix already submitted, shall submit independent
> > patch with this fix?
>
> If it hasn't been applied to any of the upstream repositories yet, then you
> can always send an updated version.
>
   The patch is already accepted by the maintainer,

http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commitdiff;h=e669db1c209eed02ca8c837914c161f5daa2d8fd
   so ill drop this fix.

 WBR,
 --Prabhakar Lad

>
> Thierry
>
Thierry Reding - Feb. 7, 2012, 7:22 a.m.
* Prabhakar Lad wrote:
>    The patch is already accepted by the maintainer,
> 
> http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commitdiff;h=e669db1c209eed02ca8c837914c161f5daa2d8fd
>    so ill drop this fix.

Okay, no problem.

Thierry

Patch

diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 9894245..2cb37dd 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -120,17 +120,17 @@  struct fsl_esdhc_cfg usdhc_cfg[2] = {
 	{USDHC4_BASE_ADDR, 1},
 };
 
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
 {
 	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+	int ret = 0;
 
 	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
 		gpio_direction_input(171); /*GPIO6_11*/
-		*cd = gpio_get_value(171);
-	} else /* Don't have the CD GPIO pin on board */
-		*cd = 0;
+		ret = !gpio_get_value(171);
+	}
 
-	return 0;
+	return ret;
 }
 
 int board_mmc_init(bd_t *bis)