linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / s390 / block / dasd_proc.c

diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index bfa010f..1aa3c26 100644 (file)
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
@@ -293,40 +294,23 @@ out_error:
 #endif                         /* CONFIG_DASD_PROFILE */
 }
 
-/*
- * Create dasd proc-fs entries.
- * In case creation failed, cleanup and return -ENOENT.
- */
 int
 dasd_proc_init(void)
 {
        dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
-       if (!dasd_proc_root_entry)
-               goto out_nodasd;
        dasd_proc_root_entry->owner = THIS_MODULE;
        dasd_devices_entry = create_proc_entry("devices",
                                               S_IFREG | S_IRUGO | S_IWUSR,
                                               dasd_proc_root_entry);
-       if (!dasd_devices_entry)
-               goto out_nodevices;
        dasd_devices_entry->proc_fops = &dasd_devices_file_ops;
        dasd_devices_entry->owner = THIS_MODULE;
        dasd_statistics_entry = create_proc_entry("statistics",
                                                  S_IFREG | S_IRUGO | S_IWUSR,
                                                  dasd_proc_root_entry);
-       if (!dasd_statistics_entry)
-               goto out_nostatistics;
        dasd_statistics_entry->read_proc = dasd_statistics_read;
        dasd_statistics_entry->write_proc = dasd_statistics_write;
        dasd_statistics_entry->owner = THIS_MODULE;
        return 0;
-
- out_nostatistics:
-       remove_proc_entry("devices", dasd_proc_root_entry);
- out_nodevices:
-       remove_proc_entry("dasd", &proc_root);
- out_nodasd:
-       return -ENOENT;
 }
 
 void