From patchwork Sun Jun 5 07:42:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 9155127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C48960221 for ; Sun, 5 Jun 2016 07:47:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C621272AA for ; Sun, 5 Jun 2016 07:47:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2124B281D2; Sun, 5 Jun 2016 07:47:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A96FD272AA for ; Sun, 5 Jun 2016 07:47:30 +0000 (UTC) Received: from localhost ([::1]:35790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9SmP-0005qF-Sy for patchwork-qemu-devel@patchwork.kernel.org; Sun, 05 Jun 2016 03:47:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9Sil-0002y1-2p for qemu-devel@nongnu.org; Sun, 05 Jun 2016 03:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9Sig-0004P8-GD for qemu-devel@nongnu.org; Sun, 05 Jun 2016 03:43:43 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:58425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9Sig-0004OP-8O; Sun, 05 Jun 2016 03:43:38 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 2E0B740911; Sun, 5 Jun 2016 10:43:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id A18E0ADC; Sun, 5 Jun 2016 10:43:32 +0300 (MSK) Received: (nullmailer pid 1109 invoked by uid 1000); Sun, 05 Jun 2016 07:43:32 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 5 Jun 2016 10:42:47 +0300 Message-Id: <28ac318783b583d7f0f8a773002e941089ecc806.1465112552.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 10/52] The only 64bit parameter of muldiv64() is the first one. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Vivier muldiv64() is "uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)" Some time it is used as muldiv64(uint32_t a, uint64_t b, uint32_t c)" This patch is the result of coccinelle script scripts/coccinelle/swap_muldiv64.cocci to reorder arguments. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/timer/omap_gptimer.c | 4 ++-- hw/usb/hcd-ohci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index 3a43863..5e3e8a6 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -133,8 +133,8 @@ static inline void omap_gp_timer_update(struct omap_gp_timer_s *timer) timer_mod(timer->timer, timer->time + expires); if (timer->ce && timer->match_val >= timer->val) { - matches = muldiv64(timer->match_val - timer->val, - timer->ticks_per_sec, timer->rate); + matches = muldiv64(timer->ticks_per_sec, + timer->match_val - timer->val, timer->rate); timer_mod(timer->match, timer->time + matches); } else timer_del(timer->match); diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 16d9ff7..25cc53f 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1474,7 +1474,7 @@ static uint32_t ohci_get_frame_remaining(OHCIState *ohci) if (tks >= usb_frame_time) return (ohci->frt << 31); - tks = muldiv64(1, tks, usb_bit_time); + tks = muldiv64(tks, 1, usb_bit_time); fr = (uint16_t)(ohci->fi - tks); return (ohci->frt << 31) | fr;