From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933290AbcHVXeX (ORCPT ); Mon, 22 Aug 2016 19:34:23 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33187 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757081AbcHVXeR (ORCPT ); Mon, 22 Aug 2016 19:34:17 -0400 From: Nicolai Stange To: Thomas Gleixner Cc: John Stultz , linux-kernel@vger.kernel.org, Nicolai Stange Subject: [RFC v4 14/22] clockevents: clockevents_program_event(): turn clc into unsigned long Date: Tue, 23 Aug 2016 01:33:12 +0200 Message-Id: <20160822233320.4548-15-nicstange@gmail.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160822233320.4548-1-nicstange@gmail.com> References: <20160822233320.4548-1-nicstange@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Right now, being of type unsigned long long, the clc local variable in clockevents_program_event() is unnecessarily wide as it gets cast to unsigned long anyway. Degrade clc's type to unsigned long and remove the now superfluous casts. Signed-off-by: Nicolai Stange --- kernel/time/clockevents.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 7832050..8fddb67 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -311,7 +311,7 @@ static int clockevents_program_min_delta(struct clock_event_device *dev) int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, bool force) { - unsigned long long clc; + unsigned long clc; int64_t delta; int rc; @@ -337,11 +337,12 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, if (delta <= 0) return force ? clockevents_program_min_delta(dev) : -ETIME; - clc = ((unsigned long long) delta * dev->mult) >> dev->shift; - clc = min_t(unsigned long, clc, dev->max_delta_ticks); - clc = max_t(unsigned long, clc, dev->min_delta_ticks_adjusted); + clc = (unsigned long)(((unsigned long long)delta * + dev->mult) >> dev->shift); + clc = min(clc, dev->max_delta_ticks); + clc = max(clc, dev->min_delta_ticks_adjusted); - rc = dev->set_next_event((unsigned long) clc, dev); + rc = dev->set_next_event(clc, dev); return (rc && force) ? clockevents_program_min_delta(dev) : rc; } -- 2.9.2