[PATCH 23/25] [drivers/misc] BUG to BUG_ON changes

From: Stoyan Gaydarov
Date: Tue Mar 10 2009 - 01:19:21 EST


Signed-off-by: Stoyan Gaydarov <stoyboyker@xxxxxxxxx>
---
drivers/misc/sgi-gru/grukservices.c | 3 +--
drivers/misc/sgi-gru/grumain.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 880c55d..a942b33 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -603,8 +603,7 @@ static int quicktest(struct gru_state *gru)
if (gru_wait(cb) != CBS_IDLE)
BUG();

- if (*(unsigned long *)ds != MAGIC)
- BUG();
+ BUG_ON(*(unsigned long *)ds != MAGIC);
gru_vstore(cb, uv_gpa(&word1), 0, XTYPE_DW, 1, 1, IMA);
if (gru_wait(cb) != CBS_IDLE)
BUG();
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 3d2fc21..65df0f6 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -153,8 +153,7 @@ static unsigned long reserve_resources(unsigned long *p, int n, int mmax,

do {
i = find_first_bit(p, mmax);
- if (i == mmax)
- BUG();
+ BUG_ON(i == mmax);
__clear_bit(i, p);
__set_bit(i, &bits);
if (idx)
--
1.6.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/