Message-ID: <1432044238.2870.148.camel@perches.com>
Subject: Re: [tip:timers/core] time: Refactor msecs_to_jiffies
From: Joe Perches <joe@perches.com>
To: yamada.m@jp.panasonic.com, linux-kernel@vger.kernel.org, sam@ravnborg.org,
        hpa@zytor.com, john.stultz@linaro.org, mmarek@suse.cz,
        hofrat@osadl.org, tglx@linutronix.de, mingo@kernel.org,
        joe@perches.com, pjt@google.com, ahh@google.com
Date: Tue, 19 May 2015 07:03:58 -0700
In-Reply-To: <tip-ca42aaf0c8616cde6161ea4391dff364efeee46a@git.kernel.org>
References: <1431951554-5563-2-git-send-email-hofrat@osadl.org>
	 <tip-ca42aaf0c8616cde6161ea4391dff364efeee46a@git.kernel.org>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1711
Lines: 48

On Tue, 2015-05-19 at 06:36 -0700, tip-bot for Nicholas Mc Guire wrote:
> Refactor the msecs_to_jiffies conditional code part in time.c and 
> jiffies.h putting it into conditional functions rather than #ifdefs
> to improve readability.
[]
> diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
[]
> +static inline unsigned long _msecs_to_jiffies(const unsigned int m)
> +{
> +		return (m + (MSEC_PER_SEC / HZ) - 1) / (MSEC_PER_SEC / HZ);
> +}
> +#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
> +/*
> + * HZ is larger than 1000, and HZ is a nice round multiple of 1000 -
> + * simply multiply with the factor between them.
> + *
> + * But first make sure the multiplication result cannot overflow:
> + */
> +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);
> +}
> +#else
> +/*
> + * Generic case - multiply, round and divide. But first check that if
> + * we are doing a net multiplication, that we wouldn't overflow:
> + */
> +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;
> +
> +		return (MSEC_TO_HZ_MUL32 * m + MSEC_TO_HZ_ADJ32)
> +			>> MSEC_TO_HZ_SHR32;
> +}
> +#endif

It'd be nicer to remove 1 level of unnecessary tab indentation in
all the _msecs_to_jiffies functions here.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/