3 files changed, 5 insertions, 8 deletions

diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 5a5bb97a081a..fc1d91294143 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -664,8 +664,7 @@ tape_3590_bread(struct tape_device *device, struct request *req)
                         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");
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 1b6a24412465..08c09d3503cf 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -624,8 +624,7 @@ tape_alloc_request(int cplength, int datasize)
 {
         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 @@ static void tape_long_busy_timeout(unsigned long data)
         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);
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 44dd0f80c847..1a9420ba518d 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -37,8 +37,8 @@ tape_std_assign_timeout(unsigned long data)
         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);