| Message ID | 20191021134357.14266-2-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Convert sparc devices to new ptimer API | expand |
On 10/21/19 3:43 PM, Peter Maydell wrote: > In the slavio timer devcie, the ptimer TimerContext::timer is typo "device" > always created by slavio_timer_init(), so there's no need to > check it for NULL; remove the single unneeded NULL check. > > This will be useful to avoid compiler/Coverity errors when > a subsequent change adds a use of t->timer before the location > we currently do the NULL check. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/timer/slavio_timer.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c > index 692d213897d..890dd53f8d8 100644 > --- a/hw/timer/slavio_timer.c > +++ b/hw/timer/slavio_timer.c > @@ -227,13 +227,11 @@ static void slavio_timer_mem_writel(void *opaque, hwaddr addr, > // set limit, reset counter > qemu_irq_lower(t->irq); > t->limit = val & TIMER_MAX_COUNT32; > - if (t->timer) { > - if (t->limit == 0) { /* free-run */ > - ptimer_set_limit(t->timer, > - LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); > - } else { > - ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); > - } > + if (t->limit == 0) { /* free-run */ > + ptimer_set_limit(t->timer, > + LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); > + } else { > + ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); > } > } > break; >
On 10/21/19 6:43 AM, Peter Maydell wrote: > In the slavio timer devcie, the ptimer TimerContext::timer is > always created by slavio_timer_init(), so there's no need to > check it for NULL; remove the single unneeded NULL check. > > This will be useful to avoid compiler/Coverity errors when > a subsequent change adds a use of t->timer before the location > we currently do the NULL check. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/timer/slavio_timer.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 692d213897d..890dd53f8d8 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -227,13 +227,11 @@ static void slavio_timer_mem_writel(void *opaque, hwaddr addr, // set limit, reset counter qemu_irq_lower(t->irq); t->limit = val & TIMER_MAX_COUNT32; - if (t->timer) { - if (t->limit == 0) { /* free-run */ - ptimer_set_limit(t->timer, - LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); - } else { - ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); - } + if (t->limit == 0) { /* free-run */ + ptimer_set_limit(t->timer, + LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); + } else { + ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); } } break;
In the slavio timer devcie, the ptimer TimerContext::timer is always created by slavio_timer_init(), so there's no need to check it for NULL; remove the single unneeded NULL check. This will be useful to avoid compiler/Coverity errors when a subsequent change adds a use of t->timer before the location we currently do the NULL check. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/timer/slavio_timer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.20.1