diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2016-05-09 15:24:56 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-06-07 18:02:49 +0300 |
| commit | 3498686220d8398d7dad300a01d1d75896ad52a6 (patch) | |
| tree | cb0167b51d3a94a424d8316200c65add32b1373c /hw | |
| parent | e9d5150739c4e321088eddfe46b88a8654d86eae (diff) | |
| download | qemu-3498686220d8398d7dad300a01d1d75896ad52a6.zip qemu-3498686220d8398d7dad300a01d1d75896ad52a6.tar.gz qemu-3498686220d8398d7dad300a01d1d75896ad52a6.tar.bz2 | |
The only 64bit parameter of muldiv64() is the first one.
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 <lvivier@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/timer/omap_gptimer.c | 4 | ||||
| -rw-r--r-- | 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; |