[PATCH] bootm: propagate register_image_handler return value

[PATCH] bootm: propagate register_image_handler return value

[Ahmad Fatoum]

While register_image_handler can't currently fail, it still returns an
error code. Propagate that error code along instead of having a blanket
return 0. This makes the code a little more compact.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/mach-stm32mp/stm32image.c | 4 +---
 arch/arm/mach-zynq/bootm-zynqimg.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-stm32mp/stm32image.c b/arch/arm/mach-stm32mp/stm32image.c
index 84975c5c3bf1..207df6894d4e 100644
--- a/arch/arm/mach-stm32mp/stm32image.c
+++ b/arch/arm/mach-stm32mp/stm32image.c
@@ -43,8 +43,6 @@ static struct image_handler image_handler_stm32_image_v1_handler = {
 
 static int stm32mp_register_stm32image_image_handler(void)
 {
-	register_image_handler(&image_handler_stm32_image_v1_handler);
-
-	return 0;
+	return register_image_handler(&image_handler_stm32_image_v1_handler);
 }
 late_initcall(stm32mp_register_stm32image_image_handler);
diff --git a/arch/arm/mach-zynq/bootm-zynqimg.c b/arch/arm/mach-zynq/bootm-zynqimg.c
index e903ab667905..77ed6880e4b6 100644
--- a/arch/arm/mach-zynq/bootm-zynqimg.c
+++ b/arch/arm/mach-zynq/bootm-zynqimg.c
@@ -42,8 +42,6 @@ static struct image_handler zynq_image_handler = {
 
 static int zynq_register_image_handler(void)
 {
-	register_image_handler(&zynq_image_handler);
-
-	return 0;
+	return register_image_handler(&zynq_image_handler);
 }
 late_initcall(zynq_register_image_handler);
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] bootm: propagate register_image_handler return value

[Sascha Hauer]

On Mon, Oct 05, 2020 at 10:06:43AM +0200, Ahmad Fatoum wrote:
> While register_image_handler can't currently fail, it still returns an
> error code. Propagate that error code along instead of having a blanket
> return 0. This makes the code a little more compact.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/mach-stm32mp/stm32image.c | 4 +---
>  arch/arm/mach-zynq/bootm-zynqimg.c | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/mach-stm32mp/stm32image.c b/arch/arm/mach-stm32mp/stm32image.c
> index 84975c5c3bf1..207df6894d4e 100644
> --- a/arch/arm/mach-stm32mp/stm32image.c
> +++ b/arch/arm/mach-stm32mp/stm32image.c
> @@ -43,8 +43,6 @@ static struct image_handler image_handler_stm32_image_v1_handler = {
>  
>  static int stm32mp_register_stm32image_image_handler(void)
>  {
> -	register_image_handler(&image_handler_stm32_image_v1_handler);
> -
> -	return 0;
> +	return register_image_handler(&image_handler_stm32_image_v1_handler);
>  }
>  late_initcall(stm32mp_register_stm32image_image_handler);
> diff --git a/arch/arm/mach-zynq/bootm-zynqimg.c b/arch/arm/mach-zynq/bootm-zynqimg.c
> index e903ab667905..77ed6880e4b6 100644
> --- a/arch/arm/mach-zynq/bootm-zynqimg.c
> +++ b/arch/arm/mach-zynq/bootm-zynqimg.c
> @@ -42,8 +42,6 @@ static struct image_handler zynq_image_handler = {
>  
>  static int zynq_register_image_handler(void)
>  {
> -	register_image_handler(&zynq_image_handler);
> -
> -	return 0;
> +	return register_image_handler(&zynq_image_handler);
>  }
>  late_initcall(zynq_register_image_handler);
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox