diff options
Diffstat (limited to 'drivers/net/ppp_generic.c')
-rw-r--r-- | drivers/net/ppp_generic.c | 9 |
1 files changed, 0 insertions, 9 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 @@ | |||
28 | #include <linux/kmod.h> | 28 | #include <linux/kmod.h> |
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <linux/list.h> | 30 | #include <linux/list.h> |
31 | #include <linux/devfs_fs_kernel.h> | ||
32 | #include <linux/netdevice.h> | 31 | #include <linux/netdevice.h> |
33 | #include <linux/poll.h> | 32 | #include <linux/poll.h> |
34 | #include <linux/ppp_defs.h> | 33 | #include <linux/ppp_defs.h> |
@@ -863,10 +862,6 @@ static int __init ppp_init(void) | |||
863 | goto out_chrdev; | 862 | goto out_chrdev; |
864 | } | 863 | } |
865 | class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp"); | 864 | class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp"); |
866 | err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0), | ||
867 | S_IFCHR|S_IRUSR|S_IWUSR, "ppp"); | ||
868 | if (err) | ||
869 | goto out_class; | ||
870 | } | 865 | } |
871 | 866 | ||
872 | out: | 867 | out: |
@@ -874,9 +869,6 @@ out: | |||
874 | printk(KERN_ERR "failed to register PPP device (%d)\n", err); | 869 | printk(KERN_ERR "failed to register PPP device (%d)\n", err); |
875 | return err; | 870 | return err; |
876 | 871 | ||
877 | out_class: | ||
878 | class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0)); | ||
879 | class_destroy(ppp_class); | ||
880 | out_chrdev: | 872 | out_chrdev: |
881 | unregister_chrdev(PPP_MAJOR, "ppp"); | 873 | unregister_chrdev(PPP_MAJOR, "ppp"); |
882 | goto out; | 874 | goto out; |
@@ -2681,7 +2673,6 @@ static void __exit ppp_cleanup(void) | |||
2681 | cardmap_destroy(&all_ppp_units); | 2673 | cardmap_destroy(&all_ppp_units); |
2682 | if (unregister_chrdev(PPP_MAJOR, "ppp") != 0) | 2674 | if (unregister_chrdev(PPP_MAJOR, "ppp") != 0) |
2683 | printk(KERN_ERR "PPP: failed to unregister PPP device\n"); | 2675 | printk(KERN_ERR "PPP: failed to unregister PPP device\n"); |
2684 | devfs_remove("ppp"); | ||
2685 | class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0)); | 2676 | class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0)); |
2686 | class_destroy(ppp_class); | 2677 | class_destroy(ppp_class); |
2687 | } | 2678 | } |