Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99432700 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy up lib64 udelay impl. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 600ee240

arch/sh/lib64/udelay.c

+2 −5
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#include <linux/sched.h>

#include <asm/param.h>



extern unsigned long loops_per_jiffy;



/*

 * Use only for very small delays (< 1 msec).

 *
@@ -49,11 +47,10 @@ void __ndelay(unsigned long long nsecs, unsigned long lpj) 


void udelay(unsigned long usecs)

{

	__udelay(usecs, loops_per_jiffy);

	__udelay(usecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy);

}



void ndelay(unsigned long nsecs)

{

	__ndelay(nsecs, loops_per_jiffy);

	__ndelay(nsecs, cpu_data[raw_smp_processor_id()].loops_per_jiffy);

}

include/asm-sh/delay.h

+6 −2
Original line number Diff line number Diff line
@@ -15,13 +15,17 @@ extern void __ndelay(unsigned long nsecs); 
extern void __const_udelay(unsigned long usecs);

extern void __delay(unsigned long loops);



#ifdef CONFIG_SUPERH32

#define udelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \

	__udelay(n))





#define ndelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \

	__ndelay(n))

#else

extern void udelay(unsigned long usecs);

extern void ndelay(unsigned long nsecs);

#endif



#endif /* __ASM_SH_DELAY_H */