[PATCH] s390: use normal switch statement for ioctls in dasd_ioctlc

Handle ioctls implemented in dasd_ioctl through the normal switch statement
that most drivers use instead of the awkward dasd_ioctl_no_register routine.
This avoids searching a linear list on every call to dasd_ioctl(), and allows
to give the various ioctl implementation functions sane prototypes, aswell as
moving the check for bdev->bd_disk->private_data from the individual functions
to dasd_ioctl.  (I think it can't actually every be NULL, but let's keep that
for later)

Signed-off-by: Christoph Hellwig <hch@lst.de>
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>

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 33157c84d1d3..9e0b371ebe69 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1807,7 +1807,6 @@ dasd_exit(void)
 #ifdef CONFIG_PROC_FS
         dasd_proc_exit();
 #endif
-        dasd_ioctl_exit();
         if (dasd_page_cache != NULL) {
                 kmem_cache_destroy(dasd_page_cache);
                 dasd_page_cache = NULL;
@@ -2093,9 +2092,6 @@ dasd_init(void)
         rc = dasd_parse();
         if (rc)
                 goto failed;
-        rc = dasd_ioctl_init();
-        if (rc)
-                goto failed;
 #ifdef CONFIG_PROC_FS
         rc = dasd_proc_init();
         if (rc)