From 8de7ed3abe2b972fd3cc2eda3953fa2c0b554e3e Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sat, 11 Mar 2006 22:56:07 +0100
Subject: [PATCH] More GCC 4.x code cleanup
---
board/cobra5272/flash.c | 3 +--
board/m5272c3/flash.c | 3 +--
board/m5282evb/flash.c | 3 +--
board/smdk2400/flash.c | 3 +--
board/trab/flash.c | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 6f5874a671..73cc2f2c10 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -256,8 +256,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
return rc;
}
-
-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;
diff --git a/board/m5272c3/flash.c b/board/m5272c3/flash.c
index fb918435c8..f156342291 100644
--- a/board/m5272c3/flash.c
+++ b/board/m5272c3/flash.c
@@ -256,8 +256,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
return rc;
}
-
-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;
diff --git a/board/m5282evb/flash.c b/board/m5282evb/flash.c
index ff70783bda..95f35ad84f 100644
--- a/board/m5282evb/flash.c
+++ b/board/m5282evb/flash.c
@@ -256,8 +256,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
return rc;
}
-
-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;
diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c
index a108af7c72..fd9992d366 100644
--- a/board/smdk2400/flash.c
+++ b/board/smdk2400/flash.c
@@ -353,8 +353,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)
{
vu_long *addr = (vu_long *) dest;
ulong result;
diff --git a/board/trab/flash.c b/board/trab/flash.c
index b4435e390f..8cdd82400b 100644
--- a/board/trab/flash.c
+++ b/board/trab/flash.c
@@ -308,8 +308,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)
{
vu_long *addr = (vu_long *) dest;
ulong result;
--
GitLab