diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:07 -0400 |
| commit | 7c69ef79741910883d5543caafa06aca3ebadbd1 (patch) | |
| tree | 655d3f60abee0195d0aadb2c86ab04ccca89a307 /drivers/block/paride | |
| parent | 1a715c5cf917326a285533d1116d725f5f2593c2 (diff) | |
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
Removes the devfs_mk_cdev() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/block/paride')
| -rw-r--r-- | drivers/block/paride/pg.c | 11 | ||||
| -rw-r--r-- | drivers/block/paride/pt.c | 16 |
2 files changed, 1 insertions, 26 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 9f72bdd2e206..3d464f767eaf 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c | |||
| @@ -676,22 +676,13 @@ static int __init pg_init(void) | |||
| 676 | } | 676 | } |
| 677 | for (unit = 0; unit < PG_UNITS; unit++) { | 677 | for (unit = 0; unit < PG_UNITS; unit++) { |
| 678 | struct pg *dev = &devices[unit]; | 678 | struct pg *dev = &devices[unit]; |
| 679 | if (dev->present) { | 679 | if (dev->present) |
| 680 | class_device_create(pg_class, NULL, MKDEV(major, unit), | 680 | class_device_create(pg_class, NULL, MKDEV(major, unit), |
| 681 | NULL, "pg%u", unit); | 681 | NULL, "pg%u", unit); |
| 682 | err = devfs_mk_cdev(MKDEV(major, unit), | ||
| 683 | S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u", | ||
| 684 | unit); | ||
| 685 | if (err) | ||
| 686 | goto out_class; | ||
| 687 | } | ||
| 688 | } | 682 | } |
| 689 | err = 0; | 683 | err = 0; |
| 690 | goto out; | 684 | goto out; |
| 691 | 685 | ||
| 692 | out_class: | ||
| 693 | class_device_destroy(pg_class, MKDEV(major, unit)); | ||
| 694 | class_destroy(pg_class); | ||
| 695 | out_chrdev: | 686 | out_chrdev: |
| 696 | unregister_chrdev(major, "pg"); | 687 | unregister_chrdev(major, "pg"); |
| 697 | out: | 688 | out: |
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index 7adadd5b29fc..c85bdcb384ae 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c | |||
| @@ -975,27 +975,11 @@ static int __init pt_init(void) | |||
| 975 | if (pt[unit].present) { | 975 | if (pt[unit].present) { |
| 976 | class_device_create(pt_class, NULL, MKDEV(major, unit), | 976 | class_device_create(pt_class, NULL, MKDEV(major, unit), |
| 977 | NULL, "pt%d", unit); | 977 | NULL, "pt%d", unit); |
| 978 | err = devfs_mk_cdev(MKDEV(major, unit), | ||
| 979 | S_IFCHR | S_IRUSR | S_IWUSR, | ||
| 980 | "pt/%d", unit); | ||
| 981 | if (err) { | ||
| 982 | class_device_destroy(pt_class, MKDEV(major, unit)); | ||
| 983 | goto out_class; | ||
| 984 | } | ||
| 985 | class_device_create(pt_class, NULL, MKDEV(major, unit + 128), | 978 | class_device_create(pt_class, NULL, MKDEV(major, unit + 128), |
| 986 | NULL, "pt%dn", unit); | 979 | NULL, "pt%dn", unit); |
| 987 | err = devfs_mk_cdev(MKDEV(major, unit + 128), | ||
| 988 | S_IFCHR | S_IRUSR | S_IWUSR, | ||
| 989 | "pt/%dn", unit); | ||
| 990 | if (err) { | ||
| 991 | class_device_destroy(pt_class, MKDEV(major, unit + 128)); | ||
| 992 | goto out_class; | ||
| 993 | } | ||
| 994 | } | 980 | } |
| 995 | goto out; | 981 | goto out; |
| 996 | 982 | ||
| 997 | out_class: | ||
| 998 | class_destroy(pt_class); | ||
| 999 | out_chrdev: | 983 | out_chrdev: |
| 1000 | unregister_chrdev(major, "pt"); | 984 | unregister_chrdev(major, "pt"); |
| 1001 | out: | 985 | out: |
