[U-Boot] [PATCH] bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 lib_arm/bootm.c        |    2 +-
 lib_avr32/bootm.c      |    2 +-
 lib_blackfin/bootm.c   |    2 +-
 lib_microblaze/bootm.c |    2 +-
 lib_nios2/bootm.c      |    1 -
 lib_sh/bootm.c         |    1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 6c2f37e..c24e659 100644
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -125,7 +125,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
 	theKernel (0, machid, bd->bi_boot_params);
 	/* does not return */
-error:
+
 	return 1;
 }
 
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 8a6109d..35240e2 100644
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -202,6 +202,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
 	theKernel(ATAG_MAGIC, params_start);
 	/* does not return */
-error:
+
 	return 1;
 }
diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index d0afb21..9938ae5 100644
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -48,6 +48,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	dcache_disable();
 	(*appl) (cmdline);
 	/* does not return */
-error:
+
 	return 1;
 }
diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 5986a31..52fe068 100644
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -49,6 +49,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
 	theKernel (commandline);
 	/* does not return */
-error:
+
 	return 1;
 }
diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index c0be4fd..34f5b8f 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -35,6 +35,5 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	kernel ();
 	/* does not return */
 
-error:
 	return 1;
 }
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index e92c848..bc1c3da 100644
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -70,6 +70,5 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	kernel();
 	/* does not return */
 
-error:
 	return 1;
 }
-- 
1.5.6.5