From a3a08c0cedd329edf5256e1d6b2bad0fca002725 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 10 Sep 2008 22:48:09 +0200
Subject: [PATCH] bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more
 need 'error' label

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 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 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 8a6109de14d..35240e2eed6 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 d0afb21ebb8..9938ae5865a 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 5986a31cc83..52fe068e03b 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 c0be4fdbf4d..34f5b8ff829 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 e92c8483120..bc1c3da9e23 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;
 }
-- 
GitLab