Messages in this thread | | | From | Juergen Gross <> | Subject | Re: [PATCH linux-next] arch/x86/xen/time.c: fix bugon.cocci warnings | Date | Mon, 23 Aug 2021 10:33:19 +0200 |
| |
On 23.08.21 04:13, CGEL wrote: > From: Jing Yangyang <jing.yangyang@zte.com.cn> > > Use BUG_ON instead of a if condition followed by BUG. > > Generated by: scripts/coccinelle/misc/bugon.cocci > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Jing Yangyang <jing.yangyang@zte.com.cn> > --- > arch/x86/xen/time.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c > index d9c945e..6e29b69 100644 > --- a/arch/x86/xen/time.c > +++ b/arch/x86/xen/time.c > @@ -210,8 +210,7 @@ static int xen_timerop_set_next_event(unsigned long delta, > { > WARN_ON(!clockevent_state_oneshot(evt)); > > - if (HYPERVISOR_set_timer_op(get_abs_timeout(delta)) < 0) > - BUG(); > + BUG_ON(HYPERVISOR_set_timer_op(get_abs_timeout(delta)) < 0); > > /* We may have missed the deadline, but there's no real way of > knowing for sure. If the event was in the past, then we'll > @@ -241,11 +240,10 @@ static int xen_vcpuop_shutdown(struct clock_event_device *evt) > { > int cpu = smp_processor_id(); > > - if (HYPERVISOR_vcpu_op(VCPUOP_stop_singleshot_timer, xen_vcpu_nr(cpu), > + BUG_ON(HYPERVISOR_vcpu_op(VCPUOP_stop_singleshot_timer, xen_vcpu_nr(cpu), > NULL) ||
Please adjust the alignment of the continuation line (i.e. insert 2 blanks). Same below.
Even better would be to avoid the repeated "xen_vcpu_nr(cpu)" by using "int vcpu = xen_vcpu_nr(smp_processor_id());" leading to the possibility to not need the continuation lines at all.
> - HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu), > - NULL)) > - BUG(); > + HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu), > + NULL)); > > return 0; > } > @@ -254,9 +252,8 @@ static int xen_vcpuop_set_oneshot(struct clock_event_device *evt) > { > int cpu = smp_processor_id(); > > - if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu), > - NULL)) > - BUG(); > + BUG_ON(HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu), > + NULL));
See above.
> > return 0; > } > @@ -373,9 +370,8 @@ void xen_timer_resume(void) > return; > > for_each_online_cpu(cpu) { > - if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, > - xen_vcpu_nr(cpu), NULL)) > - BUG(); > + BUG_ON(HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, > + xen_vcpu_nr(cpu), NULL));
See above.
Juergen [unhandled content-type:application/pgp-keys][unhandled content-type:application/pgp-signature] | |