aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-05-23 04:24:25 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-05-23 04:24:28 -0400
commit7712f83aa904fef0d7d6e5ba7684c3272bddbb19 (patch)
tree39bf9b46fbe385eb7cb44118be12f6637b83659f /drivers/s390/char
parent66ceed5ad1318863c21710f316942bcefff8081c (diff)
[S390] get rid of unused variables
Remove trivially unused variables as detected with -Wunused-but-set-variable. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
-rw-r--r--drivers/s390/char/raw3270.c2
-rw-r--r--drivers/s390/char/sclp_sdias.c3
-rw-r--r--drivers/s390/char/tape_3590.c6
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index e21a5c39ef20..810ac38631c3 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -598,7 +598,6 @@ __raw3270_size_device(struct raw3270 *rp)
598 static const unsigned char wbuf[] = 598 static const unsigned char wbuf[] =
599 { 0x00, 0x07, 0x01, 0xff, 0x03, 0x00, 0x81 }; 599 { 0x00, 0x07, 0x01, 0xff, 0x03, 0x00, 0x81 };
600 struct raw3270_ua *uap; 600 struct raw3270_ua *uap;
601 unsigned short count;
602 int rc; 601 int rc;
603 602
604 /* 603 /*
@@ -653,7 +652,6 @@ __raw3270_size_device(struct raw3270 *rp)
653 if (rc) 652 if (rc)
654 return rc; 653 return rc;
655 /* Got a Query Reply */ 654 /* Got a Query Reply */
656 count = sizeof(rp->init_data) - rp->init_request.rescnt;
657 uap = (struct raw3270_ua *) (rp->init_data + 1); 655 uap = (struct raw3270_ua *) (rp->init_data + 1);
658 /* Paranoia check. */ 656 /* Paranoia check. */
659 if (rp->init_data[0] != 0x88 || uap->uab.qcode != 0x81) 657 if (rp->init_data[0] != 0x88 || uap->uab.qcode != 0x81)
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 6a1c58dc61a7..fa733ecd3d70 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -69,9 +69,6 @@ static DEFINE_MUTEX(sdias_mutex);
69 69
70static void sdias_callback(struct sclp_req *request, void *data) 70static void sdias_callback(struct sclp_req *request, void *data)
71{ 71{
72 struct sdias_sccb *cbsccb;
73
74 cbsccb = (struct sdias_sccb *) request->sccb;
75 sclp_req_done = 1; 72 sclp_req_done = 1;
76 wake_up(&sdias_wq); /* Inform caller, that request is complete */ 73 wake_up(&sdias_wq); /* Inform caller, that request is complete */
77 TRACE("callback done\n"); 74 TRACE("callback done\n");
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index b98dcbd16711..22db2529e1b2 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:
@@ -1397,11 +1395,9 @@ static int tape_3590_crypt_error(struct tape_device *device,
1397 u8 cu_rc, ekm_rc1; 1395 u8 cu_rc, ekm_rc1;
1398 u16 ekm_rc2; 1396 u16 ekm_rc2;
1399 u32 drv_rc; 1397 u32 drv_rc;
1400 const char *bus_id;
1401 char *sense; 1398 char *sense;
1402 1399
1403 sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data; 1400 sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
1404 bus_id = dev_name(&device->cdev->dev);
1405 cu_rc = sense[0]; 1401 cu_rc = sense[0];
1406 drv_rc = *((u32*) &sense[5]) & 0xffffff; 1402 drv_rc = *((u32*) &sense[5]) & 0xffffff;
1407 ekm_rc1 = sense[9]; 1403 ekm_rc1 = sense[9];
@@ -1429,7 +1425,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
1429 struct irb *irb) 1425 struct irb *irb)
1430{ 1426{
1431 struct tape_3590_sense *sense; 1427 struct tape_3590_sense *sense;
1432 int rc;
1433 1428
1434#ifdef CONFIG_S390_TAPE_BLOCK 1429#ifdef CONFIG_S390_TAPE_BLOCK
1435 if (request->op == TO_BLOCK) { 1430 if (request->op == TO_BLOCK) {
@@ -1454,7 +1449,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
1454 * - "break": basic error recovery is done 1449 * - "break": basic error recovery is done
1455 * - "goto out:": just print error message if available 1450 * - "goto out:": just print error message if available
1456 */ 1451 */
1457 rc = -EIO;
1458 switch (sense->rc_rqc) { 1452 switch (sense->rc_rqc) {
1459 1453
1460 case 0x1110: 1454 case 0x1110: