2014-07-08 22:26:44

by Himangi Saraogi

Subject: [PATCH] xen/arm: use BUG_ON

Use BUG_ON(x) rather than if(x) BUG();

The semantic patch that fixes this problem is as follows:

// <smpl>
@@ identifier x; @@
-if (x) BUG();
+BUG_ON(x);
// </smpl>

Signed-off-by: Himangi Saraogi <[email protected]>
---
arch/arm/xen/enlighten.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 1e63243..98544c5 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -181,8 +181,7 @@ static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
int rc;
rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
- if (rc)
- BUG();
+ BUG_ON(rc);
}

static void xen_power_off(void)
@@ -190,8 +189,7 @@ static void xen_power_off(void)
struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
int rc;
rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
- if (rc)
- BUG();
+ BUG_ON(rc);
}

static int xen_cpu_notification(struct notifier_block *self,
--
1.9.1

2014-07-09 10:50:07

by Stefano Stabellini

Subject: Re: [PATCH] xen/arm: use BUG_ON

On Wed, 9 Jul 2014, Himangi Saraogi wrote:
> Use BUG_ON(x) rather than if(x) BUG();
>
> The semantic patch that fixes this problem is as follows:
>
> // <smpl>
> @@ identifier x; @@
> -if (x) BUG();
> +BUG_ON(x);
> // </smpl>
>
> Signed-off-by: Himangi Saraogi <[email protected]>

Acked-by: Stefano Stabellini <[email protected]>


> arch/arm/xen/enlighten.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
> index 1e63243..98544c5 100644
> --- a/arch/arm/xen/enlighten.c
> +++ b/arch/arm/xen/enlighten.c
> @@ -181,8 +181,7 @@ static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
> struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
> int rc;
> rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
> - if (rc)
> - BUG();
> + BUG_ON(rc);
> }
>
> static void xen_power_off(void)
> @@ -190,8 +189,7 @@ static void xen_power_off(void)
> struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
> int rc;
> rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
> - if (rc)
> - BUG();
> + BUG_ON(rc);
> }
>
> static int xen_cpu_notification(struct notifier_block *self,
> --
> 1.9.1
>