GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

jiffies: Remove the extra indentation level

Browse source 
Somehow I missed to clean that up when applying the patches. Fix it up
now.

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
This commit is contained in:
Thomas Gleixner 2015-05-19 17:14:51 +02:00
parent d25408756a
commit 4e3d9cb013
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/linux/jiffies.h
View file

@ -298,7 +298,7 @@ extern unsigned long __msecs_to_jiffies(const unsigned int m);
*/ */
static inline unsigned long _msecs_to_jiffies(const unsigned int m) static inline unsigned long _msecs_to_jiffies(const unsigned int m)
{ {
return (m + (MSEC_PER_SEC / HZ) - 1) / (MSEC_PER_SEC / HZ); return (m + (MSEC_PER_SEC / HZ) - 1) / (MSEC_PER_SEC / HZ);
} }
#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC) #elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
/* /*
@ -309,9 +309,9 @@ static inline unsigned long _msecs_to_jiffies(const unsigned int m)
*/ */
static inline unsigned long _msecs_to_jiffies(const unsigned int m) static inline unsigned long _msecs_to_jiffies(const unsigned int m)
{ {
if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET)) if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET; return MAX_JIFFY_OFFSET;
return m * (HZ / MSEC_PER_SEC); return m * (HZ / MSEC_PER_SEC);
} }
#else #else
/* /*
@ -320,11 +320,10 @@ static inline unsigned long _msecs_to_jiffies(const unsigned int m)
*/ */
static inline unsigned long _msecs_to_jiffies(const unsigned int m) static inline unsigned long _msecs_to_jiffies(const unsigned int m)
{ {
if (HZ > MSEC_PER_SEC && m > jiffies_to_msecs(MAX_JIFFY_OFFSET)) if (HZ > MSEC_PER_SEC && m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET; return MAX_JIFFY_OFFSET;
return (MSEC_TO_HZ_MUL32 * m + MSEC_TO_HZ_ADJ32) return (MSEC_TO_HZ_MUL32 * m + MSEC_TO_HZ_ADJ32) >> MSEC_TO_HZ_SHR32;
>> MSEC_TO_HZ_SHR32;
} }
#endif #endif
/** /**