[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>

16 files changed, 4 insertions, 114 deletions

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)
         }
         class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
 
-        err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
-                      S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");
-        if(err)
-                goto out_class;
-
         printk(banner);
         goto out;
 
-out_class:
-        class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
-        class_destroy(dsp56k_class);
 out_chrdev:
         unregister_chrdev(DSP56K_MAJOR, "dsp56k");
 out:
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)
         if (dtlk_dev_probe() == 0)
                 printk(", MAJOR %d\n", dtlk_major);
 
-        devfs_mk_cdev(MKDEV(dtlk_major, DTLK_MINOR),
-                       S_IFCHR | S_IRUSR | S_IWUSR, "dtlk");
-
         init_timer(&dtlk_timer);
         dtlk_timer.function = dtlk_timer_tick;
         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
         zft_class = class_create(THIS_MODULE, "zft");
         for (i = 0; i < 4; i++) {
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "qft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "zqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nzqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "rawqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nrawqft%i", i);
         }
 
 #ifdef CONFIG_ZFT_COMPRESSOR
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 9ab33c3d359f..afc25db4975f 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -724,26 +724,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                                 class_device_create(ip2_class, NULL,
                                                 MKDEV(IP2_IPL_MAJOR, 4 * i),
                                                 NULL, "ipl%d", i);
-                                err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
-                                                S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
-                                                "ip2/ipl%d", i);
-                                if (err) {
-                                        class_device_destroy(ip2_class,
-                                                MKDEV(IP2_IPL_MAJOR, 4 * i));
-                                        goto out_class;
-                                }
-
                                 class_device_create(ip2_class, NULL,
                                                 MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
                                                 NULL, "stat%d", i);
-                                err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
-                                                S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
-                                                "ip2/stat%d", i);
-                                if (err) {
-                                        class_device_destroy(ip2_class,
-                                                MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
-                                        goto out_class;
-                                }
 
                             for ( box = 0; box < ABS_MAX_BOXES; ++box )
                             {
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 55c57451ee1d..ec22aba12be9 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -804,9 +804,6 @@ static void ipmi_new_smi(int if_num, struct device *device)
         dev_t dev = MKDEV(ipmi_major, if_num);
         struct ipmi_reg_list *entry;
 
-        devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
-                      "ipmidev/%d", if_num);
-
         entry = kmalloc(sizeof(*entry), GFP_KERNEL);
         if (!entry) {
                 printk(KERN_ERR "ipmi_devintf: Unable to create the"
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index d5054ea47472..1395d4a5204e 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -5214,14 +5214,10 @@ int __init stli_init(void)
                                 "device\n");
 
         istallion_class = class_create(THIS_MODULE, "staliomem");
-        for (i = 0; i < 4; i++) {
-                devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
-                               S_IFCHR | S_IRUSR | S_IWUSR,
-                               "staliomem/%d", i);
+        for (i = 0; i < 4; i++)
                 class_device_create(istallion_class, NULL,
                                 MKDEV(STL_SIOMEMMAJOR, i),
                                 NULL, "staliomem%d", i);
-        }
 
 /*
  *      Set up the tty driver structure and register us as a driver.
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index f07a9e361f39..1a08e8ea238f 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -807,8 +807,6 @@ static int lp_register(int nr, struct parport *port)
 
         class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL,
                                 "lp%d", nr);
-        devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO,
-                        "printers/%d", nr);
 
         printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, 
                (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 1fa9fa157c12..e7aa71575aa2 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -941,13 +941,10 @@ static int __init chr_dev_init(void)
                 printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
         mem_class = class_create(THIS_MODULE, "mem");
-        for (i = 0; i < ARRAY_SIZE(devlist); i++) {
+        for (i = 0; i < ARRAY_SIZE(devlist); i++)
                 class_device_create(mem_class, NULL,
                                         MKDEV(MEM_MAJOR, devlist[i].minor),
                                         NULL, devlist[i].name);
-                devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor),
-                                S_IFCHR | devlist[i].mode, devlist[i].name);
-        }
         
         return 0;
 }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 96eb2a709e21..71e513771048 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -204,7 +204,7 @@ int misc_register(struct miscdevice * misc)
 {
         struct miscdevice *c;
         dev_t dev;
-        int err;
+        int err = 0;
 
         down(&misc_sem);
         list_for_each_entry(c, &misc_list, list) {
@@ -241,13 +241,6 @@ int misc_register(struct miscdevice * misc)
                 goto out;
         }
 
-        err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, 
-                            misc->devfs_name);
-        if (err) {
-                class_device_destroy(misc_class, dev);
-                goto out;
-        }
-
         /*
          * Add it to the front, so that later devices can "override"
          * earlier defaults
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index d437a4c9e634..ba350799405c 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -782,10 +782,6 @@ static int __init ppdev_init (void)
                 err = PTR_ERR(ppdev_class);
                 goto out_chrdev;
         }
-        for (i = 0; i < PARPORT_MAX; i++) {
-                devfs_mk_cdev(MKDEV(PP_MAJOR, i),
-                                S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);
-        }
         if (parport_register_driver(&pp_driver)) {
                 printk (KERN_WARNING CHRDEV ": unable to register with parport\n");
                 goto out_class;
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 15a7b4086524..72c8ee4c0069 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -288,7 +288,6 @@ static struct cdev raw_cdev = {
 
 static int __init raw_init(void)
 {
-        int i;
         dev_t dev = MKDEV(RAW_MAJOR, 0);
 
         if (register_chrdev_region(dev, MAX_RAW_MINORS, "raw"))
@@ -310,13 +309,6 @@ static int __init raw_init(void)
         }
         class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
-        devfs_mk_cdev(MKDEV(RAW_MAJOR, 0),
-                      S_IFCHR | S_IRUGO | S_IWUGO,
-                      "raw/rawctl");
-        for (i = 1; i < MAX_RAW_MINORS; i++)
-                devfs_mk_cdev(MKDEV(RAW_MAJOR, i),
-                              S_IFCHR | S_IRUGO | S_IWUGO,
-                              "raw/raw%d", i);
         return 0;
 
 error:
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index c090a63fbdea..a1a68f90d803 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -3071,14 +3071,10 @@ static int __init stl_init(void)
                 printk("STALLION: failed to register serial board device\n");
 
         stallion_class = class_create(THIS_MODULE, "staliomem");
-        for (i = 0; i < 4; i++) {
-                devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
-                                S_IFCHR|S_IRUSR|S_IWUSR,
-                                "staliomem/%d", i);
+        for (i = 0; i < 4; i++)
                 class_device_create(stallion_class, NULL,
                                     MKDEV(STL_SIOMEMMAJOR, i), NULL,
                                     "staliomem%d", i);
-        }
 
         stl_serial->owner = THIS_MODULE;
         stl_serial->driver_name = stl_drvname;
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 70cfe07ab999..0dc83a5bd4c1 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -443,12 +443,6 @@ tipar_register(int nr, struct parport *port)
 
         class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,
                         TIPAR_MINOR + nr), NULL, "par%d", nr);
-        /* Use devfs, tree: /dev/ticables/par/[0..2] */
-        err = devfs_mk_cdev(MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr),
-                        S_IFCHR | S_IRUGO | S_IWUGO,
-                        "ticables/par/%d", nr);
-        if (err)
-                goto out_class;
 
         /* Display informations */
         pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq ==
@@ -460,11 +454,7 @@ tipar_register(int nr, struct parport *port)
                 pr_info("tipar%d: link cable not found\n", nr);
 
         err = 0;
-        goto out;
 
-out_class:
-        class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr));
-        class_destroy(tipar_class);
 out:
         return err;
 }
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 8b2a59969868..0b9a33c0f1bd 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2979,9 +2979,6 @@ struct class_device *tty_register_device(struct tty_driver *driver,
                 return ERR_PTR(-EINVAL);
         }
 
-        devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
-                        "%s%d", driver->devfs_name, index + driver->name_base);
-
         if (driver->type == TTY_DRIVER_TYPE_PTY)
                 pty_line_name(driver, index, name);
         else
@@ -3241,14 +3238,12 @@ static int __init tty_init(void)
         if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
                 panic("Couldn't register /dev/tty driver\n");
-        devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
         class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
 
         cdev_init(&console_cdev, &console_fops);
         if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
                 panic("Couldn't register /dev/console driver\n");
-        devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");
         class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
 
 #ifdef CONFIG_UNIX98_PTYS
@@ -3256,7 +3251,6 @@ static int __init tty_init(void)
         if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
                 panic("Couldn't register /dev/ptmx driver\n");
-        devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");
         class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 #endif
 
@@ -3265,7 +3259,6 @@ static int __init tty_init(void)
         if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
             register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
                 panic("Couldn't register /dev/tty0 driver\n");
-        devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");
         class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
 
         vty_init();
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 3c1dafaa3441..1633d8206524 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -478,12 +478,6 @@ static struct class *vc_class;
 
 void vcs_make_devfs(struct tty_struct *tty)
 {
-        devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 1),
-                        S_IFCHR|S_IRUSR|S_IWUSR,
-                        "vcc/%u", tty->index + 1);
-        devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 129),
-                        S_IFCHR|S_IRUSR|S_IWUSR,
-                        "vcc/a%u", tty->index + 1);
         class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
                         NULL, "vcs%u", tty->index + 1);
         class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
@@ -503,8 +497,6 @@ int __init vcs_init(void)
                 panic("unable to get major %d for vcs device", VCS_MAJOR);
         vc_class = class_create(THIS_MODULE, "vc");
 
-        devfs_mk_cdev(MKDEV(VCS_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/0");
-        devfs_mk_cdev(MKDEV(VCS_MAJOR, 128), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/a0");
         class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
         class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
         return 0;
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index ebc337acca15..4c1a128fd77b 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -958,10 +958,6 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
                         "iseries!vt%d", i);
         class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
                         NULL, "iseries!nvt%d", i);
-        devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
-                        "iseries/vt%d", i);
-        devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80),
-                        S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);
         sprintf(tapename, "iseries/vt%d", i);
         printk(VIOTAPE_KERN_INFO "tape %s is iSeries "
                         "resource %10.10s type %4.4s, model %3.3s\n",