Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps65090' into...

[firefly-linux-kernel-4.4.55.git] / arch / arm / xen / enlighten.c

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 1e632430570b1ffc5d5358b55f0c8b4b43b80098..98544c5f86e99710a7845e7a55648cdf73c14599 100644 (file)
--- 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,