commit 6aa0d3a922c4f58fc36cc1502c6ac72f999e26bb
author Stoyan Gaydarov <stoyboyker@gmail.com> Thu Mar 26 15:24:47 2009 +0100
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Thu Mar 26 15:24:28 2009 +0100
tree 36e27fe870cc142115d7aff1a78ad2a927a4a874
parent 59f2e69d0f95bc00353628ef33fd534fbb8e3597

[S390] BUG to BUG_ON changes

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

drivers/s390/char/tape_3590.c

diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 5a5bb97..fc1d912 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -664,8 +664,7 @@
 			ccw++;
 			dst += TAPEBLOCK_HSEC_SIZE;
 		}
-		if (off > bv->bv_len)
-			BUG();
+		BUG_ON(off > bv->bv_len);
 	}
 	ccw = tape_ccw_end(ccw, NOP, 0, NULL);
 	DBF_EVENT(6, "xBREDccwg\n");

drivers/s390/char/tape_core.c

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 1b6a244..08c09d3 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -624,8 +624,7 @@
 {
 	struct tape_request *request;
 
-	if (datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-		BUG();
+	BUG_ON(datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
 	DBF_LH(6, "tape_alloc_request(%d, %d)\n", cplength, datasize);
 
@@ -782,8 +781,7 @@
 	device = (struct tape_device *) data;
 	spin_lock_irq(get_ccwdev_lock(device->cdev));
 	request = list_entry(device->req_queue.next, struct tape_request, list);
-	if (request->status != TAPE_REQUEST_LONG_BUSY)
-		BUG();
+	BUG_ON(request->status != TAPE_REQUEST_LONG_BUSY);
 	DBF_LH(6, "%08x: Long busy timeout.\n", device->cdev_id);
 	__tape_start_next_request(device);
 	device->lb_timeout.data = (unsigned long) tape_put_device(device);

drivers/s390/char/tape_std.c

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 44dd0f8..1a9420b 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -37,8 +37,8 @@
 	int rc;
 
 	request = (struct tape_request *) data;
-	if ((device = request->device) == NULL)
-		BUG();
+	device = request->device;
+	BUG_ON(!device);
 
 	DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n",
 			device->cdev_id);