aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--arch/sparc64/solaris/socksys.c2
-rw-r--r--drivers/block/acsi_slm.c4
-rw-r--r--drivers/block/paride/pg.c11
-rw-r--r--drivers/block/paride/pt.c16
-rw-r--r--drivers/char/dsp56k.c8
-rw-r--r--drivers/char/dtlk.c3
-rw-r--r--drivers/char/ftape/zftape/zftape-init.c18
-rw-r--r--drivers/char/ip2/ip2main.c17
-rw-r--r--drivers/char/ipmi/ipmi_devintf.c3
-rw-r--r--drivers/char/istallion.c6
-rw-r--r--drivers/char/lp.c2
-rw-r--r--drivers/char/mem.c5
-rw-r--r--drivers/char/misc.c9
-rw-r--r--drivers/char/ppdev.c4
-rw-r--r--drivers/char/raw.c8
-rw-r--r--drivers/char/stallion.c6
-rw-r--r--drivers/char/tipar.c10
-rw-r--r--drivers/char/tty_io.c7
-rw-r--r--drivers/char/vc_screen.c8
-rw-r--r--drivers/char/viotape.c4
-rw-r--r--drivers/isdn/capi/capi.c2
-rw-r--r--drivers/isdn/hardware/eicon/divamnt.c1
-rw-r--r--drivers/isdn/hardware/eicon/divasi.c1
-rw-r--r--drivers/isdn/hardware/eicon/divasmain.c1
-rw-r--r--drivers/macintosh/adb.c2
-rw-r--r--drivers/media/dvb/dvb-core/dvbdev.c4
-rw-r--r--drivers/media/video/videodev.c7
-rw-r--r--drivers/net/ppp_generic.c7
-rw-r--r--drivers/net/wan/cosa.c7
-rw-r--r--drivers/sbus/char/bpp.c4
-rw-r--r--drivers/sbus/char/vfc_dev.c4
-rw-r--r--drivers/telephony/phonedev.c2
-rw-r--r--drivers/video/fbmem.c2
-rw-r--r--fs/coda/psdev.c11
-rw-r--r--include/linux/devfs_fs_kernel.h4
35 files changed, 8 insertions, 202 deletions
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index fc6669e8dde1..30ba11682cae 100644
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -190,8 +190,6 @@ init_socksys(void)
190 return ret; 190 return ret;
191 } 191 }
192 192
193 devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUSR|S_IWUSR, "socksys");
194
195 file = fcheck(ret); 193 file = fcheck(ret);
196 /* N.B. Is this valid? Suppose the f_ops are in a module ... */ 194 /* N.B. Is this valid? Suppose the f_ops are in a module ... */
197 socksys_file_ops = *file->f_op; 195 socksys_file_ops = *file->f_op;
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 1ecbcc3da147..b087b3a6f06f 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 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
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 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
997out_class:
998 class_destroy(pt_class);
999out_chrdev: 983out_chrdev:
1000 unregister_chrdev(major, "pt"); 984 unregister_chrdev(major, "pt");
1001out: 985out:
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index e233cf280bc0..45caf778578c 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -518,17 +518,9 @@ static int __init dsp56k_init_driver(void)
518 } 518 }
519 class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k"); 519 class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
520 520
521 err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
522 S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");
523 if(err)
524 goto out_class;
525
526 printk(banner); 521 printk(banner);
527 goto out; 522 goto out;
528 523
529out_class:
530 class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
531 class_destroy(dsp56k_class);
532out_chrdev: 524out_chrdev:
533 unregister_chrdev(DSP56K_MAJOR, "dsp56k"); 525 unregister_chrdev(DSP56K_MAJOR, "dsp56k");
534out: 526out:
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 87dcaa237f07..e34b4f4d1c27 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -337,9 +337,6 @@ static int __init dtlk_init(void)
337 if (dtlk_dev_probe() == 0) 337 if (dtlk_dev_probe() == 0)
338 printk(", MAJOR %d\n", dtlk_major); 338 printk(", MAJOR %d\n", dtlk_major);
339 339
340 devfs_mk_cdev(MKDEV(dtlk_major, DTLK_MINOR),
341 S_IFCHR | S_IRUSR | S_IWUSR, "dtlk");
342
343 init_timer(&dtlk_timer); 340 init_timer(&dtlk_timer);
344 dtlk_timer.function = dtlk_timer_tick; 341 dtlk_timer.function = dtlk_timer_tick;
345 init_waitqueue_head(&dtlk_process_list); 342 init_waitqueue_head(&dtlk_process_list);
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index 821357ce7e0e..8c6090c3a421 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -332,29 +332,11 @@ KERN_INFO
332 zft_class = class_create(THIS_MODULE, "zft"); 332 zft_class = class_create(THIS_MODULE, "zft");
333 for (i = 0; i < 4; i++) { 333 for (i = 0; i < 4; i++) {
334 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i); 334 class_devi