diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-01-22 11:10:39 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-01-22 12:51:49 +0100 |
| commit | 55b5eb75e7ccdfe94b6ea1be6bba0c21149abecf (patch) | |
| tree | 290dc153a8b26383b24d85020887d62b68cf2d70 | |
| parent | 926a7336a776263b5fdfa7b77fec704be1cae33f (diff) | |
| download | lwn-55b5eb75e7ccdfe94b6ea1be6bba0c21149abecf.tar.gz lwn-55b5eb75e7ccdfe94b6ea1be6bba0c21149abecf.zip | |
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>
| -rw-r--r-- | drivers/s390/char/tape_34xx.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c index 9aa79702b370..de69f0ddc321 100644 --- a/drivers/s390/char/tape_34xx.c +++ b/drivers/s390/char/tape_34xx.c @@ -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, |