s390/tape: remove tape block leftovers

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 2 insertions, 14 deletions

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index b3a3e8e8656e..585618663ba4 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -401,9 +401,6 @@ tape_generic_online(struct tape_device *device,
         rc = tapechar_setup_device(device);
         if (rc)
                 goto out_minor;
-        rc = tapeblock_setup_device(device);
-        if (rc)
-                goto out_char;
 
         tape_state_set(device, TS_UNUSED);
 
@@ -411,8 +408,6 @@ tape_generic_online(struct tape_device *device,
 
         return 0;
 
-out_char:
-        tapechar_cleanup_device(device);
 out_minor:
         tape_remove_minor(device);
 out_discipline:
@@ -426,7 +421,6 @@ out:
 static void
 tape_cleanup_device(struct tape_device *device)
 {
-        tapeblock_cleanup_device(device);
         tapechar_cleanup_device(device);
         device->discipline->cleanup_device(device);
         module_put(device->discipline->owner);
@@ -785,10 +779,6 @@ __tape_start_io(struct tape_device *device, struct tape_request *request)
 {
         int rc;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        if (request->op == TO_BLOCK)
-                device->discipline->check_locate(device, request);
-#endif
         rc = ccw_device_start(
                 device->cdev,
                 request->cpaddr,
@@ -1253,7 +1243,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 }
 
 /*
- * Tape device open function used by tape_char & tape_block frontends.
+ * Tape device open function used by tape_char frontend.
  */
 int
 tape_open(struct tape_device *device)
@@ -1283,7 +1273,7 @@ tape_open(struct tape_device *device)
 }
 
 /*
- * Tape device release function used by tape_char & tape_block frontends.
+ * Tape device release function used by tape_char frontend.
  */
 int
 tape_release(struct tape_device *device)
@@ -1344,7 +1334,6 @@ tape_init (void)
         DBF_EVENT(3, "tape init\n");
         tape_proc_init();
         tapechar_init ();
-        tapeblock_init ();
         return 0;
 }
 
@@ -1358,7 +1347,6 @@ tape_exit(void)
 
         /* Get rid of the frontends */
         tapechar_exit();
-        tapeblock_exit();
         tape_proc_cleanup();
         debug_unregister (TAPE_DBF_AREA);
 }