arm: remove prototype for udelay_masked

The interruption support had be removed for ARM architecture and
the function udelay_masked() is no more used except in some timer.c
files  and have the same content than udelay() or __udelay().

This patch update each timer.c implementing this function and
remove the associated prototype in u-boot-arm.h.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index cd9b546..9289905 100644 (file)
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -46,7 +46,7 @@ ulong get_timer_masked (void)
        return TCN1;
 }
 
-void udelay_masked (unsigned long usec)
+void __udelay (unsigned long usec)
 {
        ulong endtime = get_timer_masked() + usec;
        signed long diff;
@@ -57,11 +57,6 @@ void udelay_masked (unsigned long usec)
        } while (diff >= 0);
 }
 
-void __udelay (unsigned long usec)
-{
-       udelay_masked(usec);
-}
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On ARM it just returns the timer value.

diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index e9ba87a..a6637c0 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -98,11 +98,6 @@ ulong get_timer_masked(void)
        return timestamp;
 }
 
-void udelay_masked(unsigned long usec)
-{
-       return udelay(usec);
-}
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On ARM it just returns the timer value.

diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 5784b06..2b1fd1b 100644 (file)
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -89,11 +89,6 @@ ulong get_timer_masked(void)
        return timestamp;
 }
 
-void udelay_masked(unsigned long usec)
-{
-       return udelay(usec);
-}
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On ARM it just returns the timer value.

diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 12514e4..c7829c9 100644 (file)
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -17,17 +17,12 @@ ulong get_timer (ulong base)
        return get_timer_masked ();
 }
 
-void __udelay (unsigned long usec)
-{
-       udelay_masked (usec);
-}
-
 ulong get_timer_masked (void)
 {
        return OSCR;
 }
 
-void udelay_masked (unsigned long usec)
+void __udelay (unsigned long usec)
 {
        ulong tmo;
        ulong endtime;

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index f1da115..97983de 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -40,7 +40,6 @@ int   board_init(void);
 
 /* cpu/.../interrupt.c */
 ulong  get_timer_masked        (void);
-void   udelay_masked           (unsigned long usec);
 
 /* calls to c from vectors.S */
 struct pt_regs;

diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index bbe90ae..6a98d7c 100644 (file)
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -58,11 +58,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void __udelay(unsigned long usec)
-{
-       udelay_masked(usec);
-}
-
 ulong get_timer_raw(void)
 {
        at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
@@ -87,7 +82,7 @@ ulong get_timer_masked(void)
        return get_timer_raw()/TIMER_LOAD_VAL;
 }
 
-void udelay_masked(unsigned long usec)
+void __udelay(unsigned long usec)
 {
        u32 tmo;
        u32 endtime;

diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 3063884..53086c7 100644 (file)
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -138,12 +138,6 @@ ulong get_timer_masked (void)
        return timestamp;
 }
 
-/* waits specified delay value and resets timestamp */
-void udelay_masked (unsigned long usec)
-{
-       udelay(usec);
-}
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On ARM it just returns the timer value.