[PATCH] s390: minor tape fixes

Cleanup of minor bugs found by a source code checker.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 5 insertions, 9 deletions

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 5c65cf3e5cc..b70d9269024 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -432,8 +432,8 @@ tapeblock_ioctl(
 ) {
         int rc;
         int minor;
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct tape_device *device = disk->private_data;
+        struct gendisk *disk;
+        struct tape_device *device;
 
         rc     = 0;
         disk   = inode->i_bdev->bd_disk;
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 389ee2c0f44..e6e4086d322 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -210,18 +210,14 @@ tape_state_set(struct tape_device *device, enum tape_state newstate)
                 return;
         }
         DBF_EVENT(4, "ts. dev:  %x\n", device->first_minor);
-        if (device->tape_state < TO_SIZE && device->tape_state >= 0)
-                str = tape_state_verbose[device->tape_state];
-        else
-                str = "UNKNOWN TS";
-        DBF_EVENT(4, "old ts:   %s\n", str);
-        if (device->tape_state < TO_SIZE && device->tape_state >=0 )
+        DBF_EVENT(4, "old ts:\t\n");
+        if (device->tape_state < TS_SIZE && device->tape_state >=0 )
                 str = tape_state_verbose[device->tape_state];
         else
                 str = "UNKNOWN TS";
         DBF_EVENT(4, "%s\n", str);
         DBF_EVENT(4, "new ts:\t\n");
-        if (newstate < TO_SIZE && newstate >= 0)
+        if (newstate < TS_SIZE && newstate >= 0)
                 str = tape_state_verbose[newstate];
         else
                 str = "UNKNOWN TS";