3 files changed, 1 insertions, 23 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index d643a097faa5..425ff5b117f1 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -28,7 +28,6 @@
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/list.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/netdevice.h>
 #include <linux/poll.h>
 #include <linux/ppp_defs.h>
@@ -863,10 +862,6 @@ static int __init ppp_init(void)
                         goto out_chrdev;
                 }
                 class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
-                err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
-                                S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
-                if (err)
-                        goto out_class;
         }
 
 out:
@@ -874,9 +869,6 @@ out:
                 printk(KERN_ERR "failed to register PPP device (%d)\n", err);
         return err;
 
-out_class:
-        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
-        class_destroy(ppp_class);
 out_chrdev:
         unregister_chrdev(PPP_MAJOR, "ppp");
         goto out;
@@ -2681,7 +2673,6 @@ static void __exit ppp_cleanup(void)
         cardmap_destroy(&all_ppp_units);
         if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                 printk(KERN_ERR "PPP: failed to unregister PPP device\n");
-        devfs_remove("ppp");
         class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
         class_destroy(ppp_class);
 }
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6c62d5c88268..732c5edec2e5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -780,7 +780,6 @@ static struct miscdevice tun_miscdev = {
         .minor = TUN_MINOR,
         .name = "tun",
         .fops = &tun_fops,
-        .devfs_name = "net/tun",
 };
 
 /* ethtool interface */
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index e392ee8b37a1..be5e33814cb1 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -85,7 +85,6 @@
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -393,7 +392,6 @@ static int __init cosa_init(void)
                 err = -ENODEV;
                 goto out;
         }
-        devfs_mk_dir("cosa");
         cosa_class = class_create(THIS_MODULE, "cosa");
         if (IS_ERR(cosa_class)) {
                 err = PTR_ERR(cosa_class);
@@ -402,13 +400,6 @@ static int __init cosa_init(void)
         for (i=0; i<nr_cards; i++) {
                 class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
                                 NULL, "cosa%d", i);
-                err = devfs_mk_cdev(MKDEV(cosa_major, i),
-                                S_IFCHR|S_IRUSR|S_IWUSR,
-                                "cosa/%d", i);
-                if (err) {
-                        class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                        goto out_chrdev;                
-                }
         }
         err = 0;
         goto out;
@@ -426,12 +417,9 @@ static void __exit cosa_exit(void)
         int i;
         printk(KERN_INFO "Unloading the cosa module\n");
 
-        for (i=0; i<nr_cards; i++) {
+        for (i=0; i<nr_cards; i++)
                 class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                devfs_remove("cosa/%d", i);
-        }
         class_destroy(cosa_class);
-        devfs_remove("cosa");
         for (cosa=cosa_cards; nr_cards--; cosa++) {
                 /* Clean up the per-channel data */
                 for (i=0; i<cosa->nchannels; i++) {