Commit f766093e authored Apr 16, 2015 by Javi Merino Committed by Linus Torvalds Apr 17, 2015

kernel.h: implement DIV_ROUND_CLOSEST_ULL

We have grown a number of different implementations of
DIV_ROUND_CLOSEST_ULL throughout the kernel.  Move the i915 one to
kernel.h so that it can be reused.

Signed-off-by: Javi Merino <javi.merino@arm.com>
Reviewed-by: Jeff Epler <jepler@unpythonic.net>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Guenter Roeck <linux@roeck-us.net>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Alex Elder <elder@linaro.org>
Cc: Antti Palosaari <crope@iki.fi>
Cc: Javi Merino <javi.merino@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 675cf53c

drivers/gpu/drm/i915/intel_drv.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -36,9 +36,6 @@
		#include <drm/drm_dp_mst_helper.h>
		#include <drm/drm_rect.h>

		#define DIV_ROUND_CLOSEST_ULL(ll, d) \
		({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })

		/**
		* _wait_for - magic (register) wait macro
		*

drivers/gpu/drm/i915/intel_panel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@

		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/kernel.h>
		#include <linux/moduleparam.h>
		#include "intel_drv.h"

include/linux/kernel.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,18 @@
		(((__x) - ((__d) / 2)) / (__d)); \
		} \
		)
		/*
		* Same as above but for u64 dividends. divisor must be a 32-bit
		* number.
		*/
		#define DIV_ROUND_CLOSEST_ULL(x, divisor)( \
		{ \
		typeof(divisor) __d = divisor; \
		unsigned long long _tmp = (x) + (__d) / 2; \
		do_div(_tmp, __d); \
		_tmp; \
		} \
		)

		/*
		* Multiplies an integer by a fraction, while avoiding unnecessary

Admin message