s390/tape: remove redundant if statement
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 22 Jan 2015 10:10:39 +0000 (11:10 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 22 Jan 2015 11:51:49 +0000 (12:51 +0100)
The unit check handler for 3480 / 3490 tapes used to print a different
warning message for erpa code 0x57 dependent on the device type.
The warning messages have been remove in a cleanup, the if statement
is a left over. Remove it.

Reported-by: Fraser Brown <mlfbrown@stanford.edu>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/tape_34xx.c

index 9aa7970..de69f0d 100644 (file)
@@ -773,13 +773,11 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
                        "occurred\n");
                return tape_34xx_erp_failed(request, -EIO);
        case 0x57:
-               if (device->cdev->id.driver_info == tape_3480) {
-                       /* Attention intercept. */
-                       return tape_34xx_erp_retry(request);
-               } else {
-                       /* Global status intercept. */
-                       return tape_34xx_erp_retry(request);
-               }
+               /*
+                * 3480: Attention intercept.
+                * 3490: Global status intercept.
+                */
+               return tape_34xx_erp_retry(request);
        case 0x5a:
                /*
                 * Tape length incompatible. The tape inserted is too long,