aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:07 -0400
commit7c69ef79741910883d5543caafa06aca3ebadbd1 (patch)
tree655d3f60abee0195d0aadb2c86ab04ccca89a307 /drivers/block
parent1a715c5cf917326a285533d1116d725f5f2593c2 (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')
-rw-r--r--drivers/block/acsi_slm.c4
-rw-r--r--drivers/block/paride/pg.c11
-rw-r--r--drivers/block/paride/pt.c16
3 files changed, 1 insertions, 30 deletions
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 1ecbcc3da14..b087b3a6f06 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -1005,10 +1005,6 @@ int slm_init( void )
1005 BufferP = SLMBuffer; 1005 BufferP = SLMBuffer;
1006 SLMState = IDLE; 1006 SLMState = IDLE;
1007 1007
1008 for (i = 0; i < MAX_SLM; i++) {
1009 devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
1010 S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
1011 }
1012 return 0; 1008 return 0;
1013} 1009}
1014 1010
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 9f72bdd2e20..3d464f767ea 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
692out_class:
693 class_device_destroy(pg_class, MKDEV(major, unit));
694 class_destroy(pg_class);
695out_chrdev: 686out_chrdev:
696 unregister_chrdev(major, "pg"); 687 unregister_chrdev(major, "pg");
697out: 688out:
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 7adadd5b29f..c85bdcb384a 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
997out_class:
998 class_destroy(pt_class);
999out_chrdev: 983out_chrdev:
1000 unregister_chrdev(major, "pt"); 984 unregister_chrdev(major, "pt");
1001out: 985out: