[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree

[safe/jmp/linux-2.6] / drivers / char / misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 3e4c041..f1fdd84 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -44,7 +44,6 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -129,7 +128,7 @@ static int misc_open(struct inode * inode, struct file * file)
        int minor = iminor(inode);
        struct miscdevice *c;
        int err = -ENODEV;
-       struct file_operations *old_fops, *new_fops = NULL;
+       const struct file_operations *old_fops, *new_fops = NULL;
        
        down(&misc_sem);
        
@@ -204,7 +203,7 @@ int misc_register(struct miscdevice * misc)
 {
        struct miscdevice *c;
        dev_t dev;
-       int err;
+       int err = 0;
 
        down(&misc_sem);
        list_for_each_entry(c, &misc_list, list) {
@@ -241,13 +240,6 @@ int misc_register(struct miscdevice * misc)
                goto out;
        }
 
-       err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, 
-                           misc->devfs_name);
-       if (err) {
-               class_device_destroy(misc_class, dev);
-               goto out;
-       }
-
        /*
         * Add it to the front, so that later devices can "override"
         * earlier defaults
@@ -278,7 +270,6 @@ int misc_deregister(struct miscdevice * misc)
        down(&misc_sem);
        list_del(&misc->list);
        class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
-       devfs_remove(misc->devfs_name);
        if (i < DYNAMIC_MINORS && i>0) {
                misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
        }