Browse Source

s390/tape: remove redundant if statement

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>
Martin Schwidefsky 10 years ago
parent
commit
55b5eb75e7
1 changed files with 5 additions and 7 deletions
  1. 5 7
      drivers/s390/char/tape_34xx.c

+ 5 - 7
drivers/s390/char/tape_34xx.c

@@ -773,13 +773,11 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
 			"occurred\n");
 			"occurred\n");
 		return tape_34xx_erp_failed(request, -EIO);
 		return tape_34xx_erp_failed(request, -EIO);
 	case 0x57:
 	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:
 	case 0x5a:
 		/*
 		/*
 		 * Tape length incompatible. The tape inserted is too long,
 		 * Tape length incompatible. The tape inserted is too long,