Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 03f07e5dd6e9..e7650170274a 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -47,8 +47,8 @@ tape_std_assign_timeout(unsigned long data)
                         device->cdev_id);
         rc = tape_cancel_io(device, request);
         if(rc)
-                DBF_EVENT(3, "(%s): Assign timeout: Cancel failed with rc = %i\n",
-                        dev_name(&device->cdev->dev), rc);
+                DBF_EVENT(3, "(%08x): Assign timeout: Cancel failed with rc = "
+                          "%i\n", device->cdev_id, rc);
 }
 
 int
@@ -564,7 +564,6 @@ int
 tape_std_mtreten(struct tape_device *device, int mt_count)
 {
         struct tape_request *request;
-        int rc;
 
         request = tape_alloc_request(4, 0);
         if (IS_ERR(request))
@@ -576,7 +575,7 @@ tape_std_mtreten(struct tape_device *device, int mt_count)
         tape_ccw_cc(request->cpaddr + 2, NOP, 0, NULL);
         tape_ccw_end(request->cpaddr + 3, CCW_CMD_TIC, 0, request->cpaddr);
         /* execute it, MTRETEN rc gets ignored */
-        rc = tape_do_io_interruptible(device, request);
+        tape_do_io_interruptible(device, request);
         tape_free_request(request);
         return tape_mtop(device, MTREW, 1);
 }