Patchwork [U-Boot] arm: imx: Change iomux functions to void type

login
register
mail settings
Submitter Stefan Roese
Date April 11, 2013, 9:06 a.m.
Message ID <1365671206-28491-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/235608/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Stefan Roese - April 11, 2013, 9:06 a.m.
They never return anything also than 0, so lets change the function
to void instead.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 arch/arm/imx-common/iomux-v3.c             | 18 +++++-------------
 arch/arm/include/asm/imx-common/iomux-v3.h |  4 ++--
 2 files changed, 7 insertions(+), 15 deletions(-)
Marek Vasut - April 11, 2013, 6:53 p.m.
Dear Stefan Roese,

> They never return anything also than 0, so lets change the function
> to void instead.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>

Add my:
Reviewed-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut
Stefano Babic - April 13, 2013, 8:53 p.m.
On 11/04/2013 11:06, Stefan Roese wrote:
> They never return anything also than 0, so lets change the function
> to void instead.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  arch/arm/imx-common/iomux-v3.c             | 18 +++++-------------
>  arch/arm/include/asm/imx-common/iomux-v3.h |  4 ++--
>  2 files changed, 7 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
> index 08fad78..7fe5ce7 100644
> --- a/arch/arm/imx-common/iomux-v3.c
> +++ b/arch/arm/imx-common/iomux-v3.c
> @@ -30,7 +30,7 @@ static void *base = (void *)IOMUXC_BASE_ADDR;
>  /*
>   * configures a single pad in the iomuxer
>   */
> -int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
> +void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
>  {
>  	u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
>  	u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
> @@ -50,22 +50,14 @@ int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
>  
>  	if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
>  		__raw_writel(pad_ctrl, base + pad_ctrl_ofs);
> -
> -	return 0;
>  }
>  
> -int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
> -				     unsigned count)
> +void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
> +				      unsigned count)
>  {
>  	iomux_v3_cfg_t const *p = pad_list;
>  	int i;
> -	int ret;
>  
> -	for (i = 0; i < count; i++) {
> -		ret = imx_iomux_v3_setup_pad(*p);
> -		if (ret)
> -			return ret;
> -		p++;
> -	}
> -	return 0;
> +	for (i = 0; i < count; i++)
> +		imx_iomux_v3_setup_pad(*p++);
>  }
> diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
> index c34bb76..70bf3cd 100644
> --- a/arch/arm/include/asm/imx-common/iomux-v3.h
> +++ b/arch/arm/include/asm/imx-common/iomux-v3.h
> @@ -97,8 +97,8 @@ typedef u64 iomux_v3_cfg_t;
>  
>  #define MUX_CONFIG_SION		(0x1 << 4)
>  
> -int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
> -int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
> +void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
> +void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
>  				     unsigned count);
>  
>  #endif	/* __MACH_IOMUX_V3_H__*/
> 

Right, I will put it into -next branch.

Regards,
Stefano
Stefano Babic - April 16, 2013, 11:04 a.m.
On 11/04/2013 11:06, Stefan Roese wrote:
> They never return anything also than 0, so lets change the function
> to void instead.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---

Applied to u-boot-imx, -next branch, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
index 08fad78..7fe5ce7 100644
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -30,7 +30,7 @@  static void *base = (void *)IOMUXC_BASE_ADDR;
 /*
  * configures a single pad in the iomuxer
  */
-int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
+void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 {
 	u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
 	u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
@@ -50,22 +50,14 @@  int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 
 	if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
 		__raw_writel(pad_ctrl, base + pad_ctrl_ofs);
-
-	return 0;
 }
 
-int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
-				     unsigned count)
+void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
+				      unsigned count)
 {
 	iomux_v3_cfg_t const *p = pad_list;
 	int i;
-	int ret;
 
-	for (i = 0; i < count; i++) {
-		ret = imx_iomux_v3_setup_pad(*p);
-		if (ret)
-			return ret;
-		p++;
-	}
-	return 0;
+	for (i = 0; i < count; i++)
+		imx_iomux_v3_setup_pad(*p++);
 }
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index c34bb76..70bf3cd 100644
--- a/arch/arm/include/asm/imx-common/iomux-v3.h
+++ b/arch/arm/include/asm/imx-common/iomux-v3.h
@@ -97,8 +97,8 @@  typedef u64 iomux_v3_cfg_t;
 
 #define MUX_CONFIG_SION		(0x1 << 4)
 
-int imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
-int imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
+void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
+void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
 				     unsigned count);
 
 #endif	/* __MACH_IOMUX_V3_H__*/