Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...

[pandora-kernel.git] / drivers / s390 / char / tape_3590.c

diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index b98dcbd..a7d5707 100644 (file)
--- 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,
 static int
 tape_3590_done(struct tape_device *device, struct tape_request *request)
 {
-       struct tape_3590_disc_data *disc_data;
 
        DBF_EVENT(6, "%s done\n", tape_op_verbose[request->op]);
-       disc_data = device->discdata;
 
        switch (request->op) {
        case TO_BSB:
@@ -1394,17 +1392,12 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
 static int tape_3590_crypt_error(struct tape_device *device,
                                 struct tape_request *request, struct irb *irb)
 {
-       u8 cu_rc, ekm_rc1;
+       u8 cu_rc;
        u16 ekm_rc2;
-       u32 drv_rc;
-       const char *bus_id;
        char *sense;
 
        sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
-       bus_id = dev_name(&device->cdev->dev);
        cu_rc = sense[0];
-       drv_rc = *((u32*) &sense[5]) & 0xffffff;
-       ekm_rc1 = sense[9];
        ekm_rc2 = *((u16*) &sense[10]);
        if ((cu_rc == 0) && (ekm_rc2 == 0xee31))
                /* key not defined on EKM */
@@ -1429,7 +1422,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
                     struct irb *irb)
 {
        struct tape_3590_sense *sense;
-       int rc;
 
 #ifdef CONFIG_S390_TAPE_BLOCK
        if (request->op == TO_BLOCK) {
@@ -1454,7 +1446,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
         *   - "break":     basic error recovery is done
         *   - "goto out:": just print error message if available
         */
-       rc = -EIO;
        switch (sense->rc_rqc) {
 
        case 0x1110: