X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=board%2Fat91rm9200dk%2Fflash.c;h=0513d61d73f2df9d211c39bbf0e2b481e85aef57;hb=1ac559d4aa358f63b48c62b564224c06feeb4e36;hp=5220fcf5d96435ccc22c959bf08b136e7fe357af;hpb=8b07a1103dc7dcadc80c4a9681cfa7d225e8e224;p=oweals%2Fu-boot.git

diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c
index 5220fcf5d9..0513d61d73 100644
--- a/board/at91rm9200dk/flash.c
+++ b/board/at91rm9200dk/flash.c
@@ -259,8 +259,7 @@ void flash_print_info (flash_info_t * info)
 		break;
 	default:
 		printf ("Unknown Chip Type\n");
-		goto Done;
-		break;
+		return;
 	}
 
 	printf ("  Size: %ld MB in %d Sectors\n",
@@ -275,8 +274,6 @@ void flash_print_info (flash_info_t * info)
 			info->protect[i] ? " (RO)" : "     ");
 	}
 	printf ("\n");
-
-Done:	;
 }
 
 /*-----------------------------------------------------------------------
@@ -396,8 +393,7 @@ outahere:
  * Copy memory to flash
  */
 
-volatile static int write_word (flash_info_t * info, ulong dest,
-								ulong data)
+static int write_word (flash_info_t * info, ulong dest, ulong data)
 {
 	volatile u16 *addr = (volatile u16 *) dest;
 	ulong result;
@@ -412,7 +408,6 @@ volatile static int write_word (flash_info_t * info, ulong dest,
 	if ((result & data) != data)
 		return ERR_NOT_ERASED;
 
-
 	/*
 	 * Disable interrupts which might cause a timeout
 	 * here. Remember that our exception vectors are