aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/tape_3590.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/char/tape_3590.c')
-rw-r--r--drivers/s390/char/tape_3590.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index b98dcbd16711..a7d570728882 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -796,10 +796,8 @@ static void tape_3590_med_state_set(struct tape_device *device,
796static int 796static int
797tape_3590_done(struct tape_device *device, struct tape_request *request) 797tape_3590_done(struct tape_device *device, struct tape_request *request)
798{ 798{
799 struct tape_3590_disc_data *disc_data;
800 799
801 DBF_EVENT(6, "%s done\n", tape_op_verbose[request->op]); 800 DBF_EVENT(6, "%s done\n", tape_op_verbose[request->op]);
802 disc_data = device->discdata;
803 801
804 switch (request->op) { 802 switch (request->op) {
805 case TO_BSB: 803 case TO_BSB:
@@ -1394,17 +1392,12 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
1394static int tape_3590_crypt_error(struct tape_device *device, 1392static int tape_3590_crypt_error(struct tape_device *device,
1395 struct tape_request *request, struct irb *irb) 1393 struct tape_request *request, struct irb *irb)
1396{ 1394{
1397 u8 cu_rc, ekm_rc1; 1395 u8 cu_rc;
1398 u16 ekm_rc2; 1396 u16 ekm_rc2;
1399 u32 drv_rc;
1400 const char *bus_id;
1401 char *sense; 1397 char *sense;
1402 1398
1403 sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data; 1399 sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
1404 bus_id = dev_name(&device->cdev->dev);
1405 cu_rc = sense[0]; 1400 cu_rc = sense[0];
1406 drv_rc = *((u32*) &sense[5]) & 0xffffff;
1407 ekm_rc1 = sense[9];
1408 ekm_rc2 = *((u16*) &sense[10]); 1401 ekm_rc2 = *((u16*) &sense[10]);
1409 if ((cu_rc == 0) && (ekm_rc2 == 0xee31)) 1402 if ((cu_rc == 0) && (ekm_rc2 == 0xee31))
1410 /* key not defined on EKM */ 1403 /* key not defined on EKM */
@@ -1429,7 +1422,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
1429 struct irb *irb) 1422 struct irb *irb)
1430{ 1423{
1431 struct tape_3590_sense *sense; 1424 struct tape_3590_sense *sense;
1432 int rc;
1433 1425
1434#ifdef CONFIG_S390_TAPE_BLOCK 1426#ifdef CONFIG_S390_TAPE_BLOCK
1435 if (request->op == TO_BLOCK) { 1427 if (request->op == TO_BLOCK) {
@@ -1454,7 +1446,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
1454 * - "break": basic error recovery is done 1446 * - "break": basic error recovery is done
1455 * - "goto out:": just print error message if available 1447 * - "goto out:": just print error message if available
1456 */ 1448 */
1457 rc = -EIO;
1458 switch (sense->rc_rqc) { 1449 switch (sense->rc_rqc) {
1459 1450
1460 case 0x1110: 1451 case 0x1110: