From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbbCWHje (ORCPT ); Mon, 23 Mar 2015 03:39:34 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:34085 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751416AbbCWHjb (ORCPT ); Mon, 23 Mar 2015 03:39:31 -0400 Date: Mon, 23 Mar 2015 08:41:15 +0100 From: Daniel Vetter To: Javi Merino Cc: akpm@linux-foundation.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Guenter Roeck , "Darrick J. Wong" Subject: Re: [PATCH 1/4] kernel.h: Implement DIV_ROUND_CLOSEST_ULL Message-ID: <20150323074115.GB1349@phenom.ffwll.local> Mail-Followup-To: Javi Merino , akpm@linux-foundation.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Guenter Roeck , "Darrick J. Wong" References: <1426850083-11049-1-git-send-email-javi.merino@arm.com> <1426850083-11049-2-git-send-email-javi.merino@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426850083-11049-2-git-send-email-javi.merino@arm.com> X-Operating-System: Linux phenom 4.0.0-rc3+ User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 20, 2015 at 11:14:40AM +0000, Javi Merino wrote: > 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. > > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: David Airlie > Cc: Darrick J. Wong > Cc: Guenter Roeck > Cc: Andrew Morton > Signed-off-by: Javi Merino Acked-by: Daniel Vetter And preemptive ack for the next version with the includes at different places. -Daniel > --- > drivers/gpu/drm/i915/intel_drv.h | 4 +--- > include/linux/kernel.h | 11 +++++++++++ > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index eef79ccd0b7c..346e28fdd7dd 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -28,6 +28,7 @@ > #include > #include > #include > +#include > #include > #include "i915_drv.h" > #include > @@ -36,9 +37,6 @@ > #include > #include > > -#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 > * > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > index d6d630d31ef3..f7d744e9d275 100644 > --- a/include/linux/kernel.h > +++ b/include/linux/kernel.h > @@ -103,6 +103,17 @@ > (((__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)( \ > +{ \ > + unsigned long long _tmp = (x) + (divisor) / 2; \ > + do_div(_tmp, divisor); \ > + _tmp; \ > +} \ > +) > > /* > * Multiplies an integer by a fraction, while avoiding unnecessary > -- > 1.9.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch