1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c551bb84dbfb..6913b0623167 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -48,7 +48,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/completion.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/unistd.h>
 #include <linux/spinlock.h>
 #include <linux/kmod.h>
@@ -136,9 +135,8 @@ struct scsi_request *scsi_allocate_request(struct scsi_device *sdev,
         const int size = offset + sizeof(struct request);
         struct scsi_request *sreq;
   
-        sreq = kmalloc(size, gfp_mask);
+        sreq = kzalloc(size, gfp_mask);
         if (likely(sreq != NULL)) {
-                memset(sreq, 0, size);
                 sreq->sr_request = (struct request *)(((char *)sreq) + offset);
                 sreq->sr_device = sdev;
                 sreq->sr_host = sdev->host;
@@ -1248,7 +1246,6 @@ static int __init init_scsi(void)
         for_each_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
-        devfs_mk_dir("scsi");
         printk(KERN_NOTICE "SCSI subsystem initialized\n");
         return 0;
 
@@ -1273,7 +1270,6 @@ static void __exit exit_scsi(void)
         scsi_exit_sysctl();
         scsi_exit_hosts();
         scsi_exit_devinfo();
-        devfs_remove("scsi");
         scsi_exit_procfs();
         scsi_exit_queue();
 }