aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ppp_generic.c7
-rw-r--r--drivers/net/wan/cosa.c7
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index d643a097faa5..52bc51545134 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -863,10 +863,6 @@ static int __init ppp_init(void)
863 goto out_chrdev; 863 goto out_chrdev;
864 } 864 }
865 class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp"); 865 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 } 866 }
871 867
872out: 868out:
@@ -874,9 +870,6 @@ out:
874 printk(KERN_ERR "failed to register PPP device (%d)\n", err); 870 printk(KERN_ERR "failed to register PPP device (%d)\n", err);
875 return err; 871 return err;
876 872
877out_class:
878 class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
879 class_destroy(ppp_class);
880out_chrdev: 873out_chrdev:
881 unregister_chrdev(PPP_MAJOR, "ppp"); 874 unregister_chrdev(PPP_MAJOR, "ppp");
882 goto out; 875 goto out;
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 62b7087e44d0..c7b530628c8e 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -401,13 +401,6 @@ static int __init cosa_init(void)
401 for (i=0; i<nr_cards; i++) { 401 for (i=0; i<nr_cards; i++) {
402 class_device_create(cosa_class, NULL, MKDEV(cosa_major, i), 402 class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
403 NULL, "cosa%d", i); 403 NULL, "cosa%d", i);
404 err = devfs_mk_cdev(MKDEV(cosa_major, i),
405 S_IFCHR|S_IRUSR|S_IWUSR,
406 "cosa/%d", i);
407 if (err) {
408 class_device_destroy(cosa_class, MKDEV(cosa_major, i));
409 goto out_chrdev;
410 }
411 } 404 }
412 err = 0; 405 err = 0;
413 goto out; 406 goto out;