diff options
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/cosa.c | 14 |
1 files changed, 1 insertions, 13 deletions
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 @@ | |||
85 | #include <linux/slab.h> | 85 | #include <linux/slab.h> |
86 | #include <linux/poll.h> | 86 | #include <linux/poll.h> |
87 | #include <linux/fs.h> | 87 | #include <linux/fs.h> |
88 | #include <linux/devfs_fs_kernel.h> | ||
89 | #include <linux/interrupt.h> | 88 | #include <linux/interrupt.h> |
90 | #include <linux/delay.h> | 89 | #include <linux/delay.h> |
91 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |
@@ -393,7 +392,6 @@ static int __init cosa_init(void) | |||
393 | err = -ENODEV; | 392 | err = -ENODEV; |
394 | goto out; | 393 | goto out; |
395 | } | 394 | } |
396 | devfs_mk_dir("cosa"); | ||
397 | cosa_class = class_create(THIS_MODULE, "cosa"); | 395 | cosa_class = class_create(THIS_MODULE, "cosa"); |
398 | if (IS_ERR(cosa_class)) { | 396 | if (IS_ERR(cosa_class)) { |
399 | err = PTR_ERR(cosa_class); | 397 | err = PTR_ERR(cosa_class); |
@@ -402,13 +400,6 @@ static int __init cosa_init(void) | |||
402 | for (i=0; i<nr_cards; i++) { | 400 | for (i=0; i<nr_cards; i++) { |
403 | class_device_create(cosa_class, NULL, MKDEV(cosa_major, i), | 401 | class_device_create(cosa_class, NULL, MKDEV(cosa_major, i), |
404 | NULL, "cosa%d", i); | 402 | NULL, "cosa%d", i); |
405 | err = devfs_mk_cdev(MKDEV(cosa_major, i), | ||
406 | S_IFCHR|S_IRUSR|S_IWUSR, | ||
407 | "cosa/%d", i); | ||
408 | if (err) { | ||
409 | class_device_destroy(cosa_class, MKDEV(cosa_major, i)); | ||
410 | goto out_chrdev; | ||
411 | } | ||
412 | } | 403 | } |
413 | err = 0; | 404 | err = 0; |
414 | goto out; | 405 | goto out; |
@@ -426,12 +417,9 @@ static void __exit cosa_exit(void) | |||
426 | int i; | 417 | int i; |
427 | printk(KERN_INFO "Unloading the cosa module\n"); | 418 | printk(KERN_INFO "Unloading the cosa module\n"); |
428 | 419 | ||
429 | for (i=0; i<nr_cards; i++) { | 420 | for (i=0; i<nr_cards; i++) |
430 | class_device_destroy(cosa_class, MKDEV(cosa_major, i)); | 421 | class_device_destroy(cosa_class, MKDEV(cosa_major, i)); |
431 | devfs_remove("cosa/%d", i); | ||
432 | } | ||
433 | class_destroy(cosa_class); | 422 | class_destroy(cosa_class); |
434 | devfs_remove("cosa"); | ||
435 | for (cosa=cosa_cards; nr_cards--; cosa++) { | 423 | for (cosa=cosa_cards; nr_cards--; cosa++) { |
436 | /* Clean up the per-channel data */ | 424 | /* Clean up the per-channel data */ |
437 | for (i=0; i<cosa->nchannels; i++) { | 425 | for (i=0; i<cosa->nchannels; i++) { |