| Message ID | 20210209132040.5091-5-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | New APIs for the Clock framework | expand |
On Tue, Feb 9, 2021 at 5:21 AM Peter Maydell <peter.maydell@linaro.org> wrote: > Use the new clock_ns_to_ticks() function in npcm7xx_timer where > appropriate. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > Reviewed-by: Hao Wu <wuhaotsh@google.com> Thanks! > --- > hw/timer/npcm7xx_timer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c > index 4efdf135b82..32f5e021f85 100644 > --- a/hw/timer/npcm7xx_timer.c > +++ b/hw/timer/npcm7xx_timer.c > @@ -138,8 +138,8 @@ static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer > *t, uint32_t count) > /* Convert a time interval in nanoseconds to a timer cycle count. */ > static uint32_t npcm7xx_timer_ns_to_count(NPCM7xxTimer *t, int64_t ns) > { > - return ns / clock_ticks_to_ns(t->ctrl->clock, > - npcm7xx_tcsr_prescaler(t->tcsr)); > + return clock_ns_to_ticks(t->ctrl->clock, ns) / > + npcm7xx_tcsr_prescaler(t->tcsr); > } > > static uint32_t npcm7xx_watchdog_timer_prescaler(const > NPCM7xxWatchdogTimer *t) > -- > 2.20.1 > > >
On 2/9/21 2:20 PM, Peter Maydell wrote: > Use the new clock_ns_to_ticks() function in npcm7xx_timer where > appropriate. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/timer/npcm7xx_timer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 13:20 Tue 09 Feb , Peter Maydell wrote: > Use the new clock_ns_to_ticks() function in npcm7xx_timer where > appropriate. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Luc Michel <luc@lmichel.fr> > --- > hw/timer/npcm7xx_timer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c > index 4efdf135b82..32f5e021f85 100644 > --- a/hw/timer/npcm7xx_timer.c > +++ b/hw/timer/npcm7xx_timer.c > @@ -138,8 +138,8 @@ static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer *t, uint32_t count) > /* Convert a time interval in nanoseconds to a timer cycle count. */ > static uint32_t npcm7xx_timer_ns_to_count(NPCM7xxTimer *t, int64_t ns) > { > - return ns / clock_ticks_to_ns(t->ctrl->clock, > - npcm7xx_tcsr_prescaler(t->tcsr)); > + return clock_ns_to_ticks(t->ctrl->clock, ns) / > + npcm7xx_tcsr_prescaler(t->tcsr); > } > > static uint32_t npcm7xx_watchdog_timer_prescaler(const NPCM7xxWatchdogTimer *t) > -- > 2.20.1 > --
diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index 4efdf135b82..32f5e021f85 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -138,8 +138,8 @@ static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer *t, uint32_t count) /* Convert a time interval in nanoseconds to a timer cycle count. */ static uint32_t npcm7xx_timer_ns_to_count(NPCM7xxTimer *t, int64_t ns) { - return ns / clock_ticks_to_ns(t->ctrl->clock, - npcm7xx_tcsr_prescaler(t->tcsr)); + return clock_ns_to_ticks(t->ctrl->clock, ns) / + npcm7xx_tcsr_prescaler(t->tcsr); } static uint32_t npcm7xx_watchdog_timer_prescaler(const NPCM7xxWatchdogTimer *t)
Use the new clock_ns_to_ticks() function in npcm7xx_timer where appropriate. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/timer/npcm7xx_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)