Skip to content

Commit

Permalink
jiffies: Remove the extra indentation level
Browse files Browse the repository at this point in the history
Somehow I missed to clean that up when applying the patches. Fix it up
now.

Reported-by: Joe Perches <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Nicholas Mc Guire <[email protected]>
  • Loading branch information
KAGA-KOKO committed May 19, 2015
1 parent d254087 commit 4e3d9cb
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions include/linux/jiffies.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
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)
/*
Expand All @@ -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)
{
if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET;
return m * (HZ / MSEC_PER_SEC);
if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET;
return m * (HZ / MSEC_PER_SEC);
}
#else
/*
Expand All @@ -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)
{
if (HZ > MSEC_PER_SEC && m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET;
if (HZ > MSEC_PER_SEC && m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET;

return (MSEC_TO_HZ_MUL32 * m + MSEC_TO_HZ_ADJ32)
>> MSEC_TO_HZ_SHR32;
return (MSEC_TO_HZ_MUL32 * m + MSEC_TO_HZ_ADJ32) >> MSEC_TO_HZ_SHR32;
}
#endif
/**
Expand Down

0 comments on commit 4e3d9cb

Please sign in to comment.