From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axwTy-0001OX-Cb for qemu-devel@nongnu.org; Wed, 04 May 2016 09:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axwTm-0004N8-Qg for qemu-devel@nongnu.org; Wed, 04 May 2016 09:04:44 -0400 From: Laurent Vivier Date: Wed, 4 May 2016 15:04:07 +0200 Message-Id: <1462367048-20997-3-git-send-email-lvivier@redhat.com> In-Reply-To: <1462367048-20997-1-git-send-email-lvivier@redhat.com> References: <1462367048-20997-1-git-send-email-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] The only 64bit parameter of muldiv64() is the first one. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Cc: Laurent Vivier , Peter Maydell , Gerd Hoffmann 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 --- 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 ffab561..e5b535f 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; -- 2.5.5