}
        }
 
-       if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, info->unmap, j))
-               BUG();
+       BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, info->unmap, j));
 
        *leaked = false;
        for (i = 0; i < j; i++) {
                gnttab_set_unmap_op(&unmap[i], vaddrs[i],
                                    GNTMAP_host_map, handles[i]);
 
-       if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i))
-               BUG();
+       BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i));
 
        err = GNTST_okay;
        for (i = 0; i < nr_handles; i++) {
                unmap[i].handle = node->handles[i];
        }
 
-       if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i))
-               BUG();
+       BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i));
 
        err = GNTST_okay;
        leaked = false;