[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree

Removes the devfs_mk_dir() function and all callers of it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 0897852b09a386fdfcfcad295f30688facc65d18..8f6bb9375193766ec25b6df2af473535ea86b300 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -841,7 +841,6 @@ int ubd_init(void)
 {
         int i;
 
-       devfs_mk_dir("ubd");
        if (register_blkdev(MAJOR_NR, "ubd"))
                return -1;
 
@@ -855,7 +854,6 @@ int ubd_init(void)
                char name[sizeof("ubd_nnn\0")];
 
                snprintf(name, sizeof(name), "ubd_%d", fake_major);
-               devfs_mk_dir(name);
                if (register_blkdev(fake_major, "ubd"))
                        return -1;
        }

diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 4cb9c13362874cedbed44c24a2982046d1e74e4c..1ecbcc3da1476f864669d7d2f5ce9e61760f1b3a 100644 (file)
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -1005,7 +1005,6 @@ int slm_init( void )
        BufferP = SLMBuffer;
        SLMState = IDLE;
        
-       devfs_mk_dir("slm");
        for (i = 0; i < MAX_SLM; i++) {
                devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
                                S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index dff1e67b1dd4e2768447ac92465caf8e1cceb97a..03a4dff05f27613f38479441858b40b8f6f0a204 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4261,8 +4261,6 @@ static int __init floppy_init(void)
                motor_off_timer[dr].function = motor_off_callback;
        }
 
-       devfs_mk_dir("floppy");
-
        err = register_blkdev(FLOPPY_MAJOR, "fd");
        if (err)
                goto out_devfs_remove;

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3c74ea729fc79529ed766b98f3e1d2b78bb3da57..f650d20f2a172a6480c3374766af943624c7b185 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1277,8 +1277,6 @@ static int __init loop_init(void)
                        goto out_mem3;
        }
 
-       devfs_mk_dir("loop");
-
        for (i = 0; i < max_loop; i++) {
                struct loop_device *lo = &loop_dev[i];
                struct gendisk *disk = disks[i];

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7f554f2ed0797af3b39d87d4354609169203fdb0..618e258ca5d0d9dea6eb4f005632ad860fbf8fbf 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -642,7 +642,6 @@ static int __init nbd_init(void)
        printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
        dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
 
-       devfs_mk_dir("nbd");
        for (i = 0; i < nbds_max; i++) {
                struct gendisk *disk = nbd_dev[i].disk;
                nbd_dev[i].file = NULL;

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 79b868254032a68505abb3140b8918f8395ee4e2..9f72bdd2e206fb5c395791daa279cc6cfb9905a9 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -674,7 +674,6 @@ static int __init pg_init(void)
                err = PTR_ERR(pg_class);
                goto out_chrdev;
        }
-       devfs_mk_dir("pg");
        for (unit = 0; unit < PG_UNITS; unit++) {
                struct pg *dev = &devices[unit];
                if (dev->present) {

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index d2013d362403819c49c2e21ffe54f64f311796cd..7adadd5b29fc32fee1a1e7f5f6a7e1e99d3730e5 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -971,7 +971,6 @@ static int __init pt_init(void)
                goto out_chrdev;
        }
 
-       devfs_mk_dir("pt");
        for (unit = 0; unit < PT_UNITS; unit++)
                if (pt[unit].present) {
                        class_device_create(pt_class, NULL, MKDEV(major, unit),

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 940bfd7951e5c1c582a672447b65dd28ff1367c7..67821a8c62108069f08aab228e90f87f1ee2dc6f 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -442,8 +442,6 @@ static int __init rd_init(void)
                goto out;
        }
 
-       devfs_mk_dir("rd");
-
        for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
                struct gendisk *disk = rd_disks[i];
 

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 01f042f6f1c42874e9090ce60f0e925d7b73726c..018b2921e8fc89a21d003d12de842dcf1b6afe28 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1019,8 +1019,6 @@ int swim3_init(void)
        int err = -ENOMEM;
        int i;
 
-       devfs_mk_dir("floppy");
-
        swim = find_devices("floppy");
        while (swim && (floppy_count < MAX_FLOPPIES))
        {

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 2ae08b343b935518c86098959866299e73f213e8..9fb3f51e574ef6c4e624dc2a14319144864b00a6 100644 (file)
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1672,8 +1672,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        if (host->flags & FL_DYN_MAJOR)
                host->major = rc;
 
-       devfs_mk_dir(DRV_NAME);
-
        rc = carm_init_disks(host);
        if (rc)
                goto err_out_blkdev_disks;

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 60e9a9457c6b0789b7b29e0e8c36e148b9424653..088e5ba15c24859ecff487aaf1e1c08e4c1aa35c 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -2445,7 +2445,6 @@ static int __init ub_init(void)
 
        if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
                goto err_regblkdev;
-       devfs_mk_dir(DEVFS_NAME);
 
        if ((rc = usb_register(&ub_driver)) != 0)
                goto err_register;

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 05c9e865ecaf85a33eafa3be2cfe0bb837a71148..ee4499acf1a1cf596c8671518ca48e3da47e2722 100644 (file)
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5808,8 +5808,6 @@ int __init sbpcd_init(void)
                return -ENOMEM;
        }
 
-       devfs_mk_dir("sbp");
-
        for (j=0;j<NR_SBPCD;j++)
        {
                struct cdrom_device_info * sbpcd_infop;

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index e1c95374984cccb89fec0427b5185de80dab6785..55c57451ee1dbf54b9cc1c5c76c70ab8d9386b6c 100644 (file)
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -872,8 +872,6 @@ static __init int init_ipmi_devintf(void)
                ipmi_major = rv;
        }
 
-       devfs_mk_dir(DEVICE_NAME);
-
        rv = ipmi_smi_watcher_register(&smi_watcher);
        if (rv) {
                unregister_chrdev(ipmi_major, DEVICE_NAME);

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index ef20c1fc9c4c121cf51d7102096cfb55f3fd5227..d5054ea4747262100b1acbdaa4625765483b3f1c 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -5213,7 +5213,6 @@ int __init stli_init(void)
                printk(KERN_ERR "STALLION: failed to register serial memory "
                                "device\n");
 
-       devfs_mk_dir("staliomem");
        istallion_class = class_create(THIS_MODULE, "staliomem");
        for (i = 0; i < 4; i++) {
                devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index e572605252935c8562b64dbfcb6ed483fbd10756..f07a9e361f3980ca5f03464cccddd388b85010d8 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -907,7 +907,6 @@ static int __init lp_init (void)
                return -EIO;
        }
 
-       devfs_mk_dir("printers");
        lp_class = class_create(THIS_MODULE, "printer");
        if (IS_ERR(lp_class)) {
                err = PTR_ERR(lp_class);

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index bee6c47b45bdd162e33e50e32171667dd6df8df8..d437a4c9e634bb63436e365a31c0921d74b582b0 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -782,7 +782,6 @@ static int __init ppdev_init (void)
                err = PTR_ERR(ppdev_class);
                goto out_chrdev;
        }
-       devfs_mk_dir("parports");
        for (i = 0; i < PARPORT_MAX; i++) {
                devfs_mk_cdev(MKDEV(PP_MAJOR, i),
                                S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 9b5a2c0e7008c82183649e6006784088ceabd220..64d3d1d0b31bac384cde545b45c68a961237bbc6 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -351,7 +351,6 @@ static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
 
 static void __init unix98_pty_init(void)
 {
-       devfs_mk_dir("pts");
        ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
        if (!ptm_driver)
                panic("Couldn't allocate Unix98 ptm driver");

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index a9c5a7230f8958b5d8ee1338fa88c40cddf79a58..c090a63fbdea055b9ab4002e8aeb8962723b24d3 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -3069,7 +3069,6 @@ static int __init stl_init(void)
  */
        if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stl_fsiomem))
                printk("STALLION: failed to register serial board device\n");
-       devfs_mk_dir("staliomem");
 
        stallion_class = class_create(THIS_MODULE, "staliomem");
        for (i = 0; i < 4; i++) {

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 079db5a935a1210520d332071d6a47611182dfa4..70cfe07ab999d0c644038921b71f8cc1da48c5f4 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -507,9 +507,6 @@ tipar_init_module(void)
                goto out;
        }
 
-       /* Use devfs with tree: /dev/ticables/par/[0..2] */
-       devfs_mk_dir("ticables/par");
-
        tipar_class = class_create(THIS_MODULE, "ticables");
        if (IS_ERR(tipar_class)) {
                err = PTR_ERR(tipar_class);

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3edb3477f987d4199c32d94e96d03e2c40e3ef1f..181971a978ba7f09f92a2b5c15ae5a8648e205f3 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -68,7 +68,6 @@ static int dm_hash_init(void)
 {
        init_buckets(_name_buckets);
        init_buckets(_uuid_buckets);
-       devfs_mk_dir(DM_DIR);
        return 0;
 }
 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 306268ec99ff11572e975145f3f916ee4144cf63..33b1a8943e4a051b35ed4a27e375d698d8c4533a 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5553,7 +5553,6 @@ static int __init md_init(void)
                unregister_blkdev(MAJOR_NR, "md");
                return -1;
        }
-       devfs_mk_dir("md");
        blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
                                md_probe, NULL, NULL);
        blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 134c2bbbeeb5f75e89921413850a0bffec367ed6..cf78a72320e5380483401c0370e1c85f72c29c39 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -302,7 +302,6 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
 
        printk ("DVB: registering new adapter (%s).\n", name);
 
-       devfs_mk_dir("dvb/adapter%d", num);
        adap->num = num;
        adap->name = name;
        adap->module = module;
@@ -410,8 +409,6 @@ static int __init init_dvbdev(void)
                goto error;
        }
 
-       devfs_mk_dir("dvb");
-
        dvb_class = class_create(THIS_MODULE, "dvb");
        if (IS_ERR(dvb_class)) {
                retval = PTR_ERR(dvb_class);

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 587458b370b9a9d71c817d0375d140847f01c505..82c660bf1652504e0e1dbee0840a41135b3b1e4e 100644 (file)
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -555,7 +555,6 @@ static int __init mmc_blk_init(void)
        if (major == 0)
                major = res;
 
-       devfs_mk_dir("mmc");
        return mmc_register_driver(&mmc_driver);
 
  out:

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index e392ee8b37a14828e02b8fc9198d8f8ab0618747..62b7087e44d03f36843355720986a4f503b49121 100644 (file)
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -393,7 +393,6 @@ static int __init cosa_init(void)
                err = -ENODEV;
                goto out;
        }
-       devfs_mk_dir("cosa");
        cosa_class = class_create(THIS_MODULE, "cosa");
        if (IS_ERR(cosa_class)) {
                err = PTR_ERR(cosa_class);

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index cfb1fff3787caafd63fe05a2c36587bfdb8f19a5..09bf44fdb1d1aae9ca7039c57c25e25646490f91 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2111,9 +2111,6 @@ dasd_init(void)
 
        dasd_diag_discipline_pointer = NULL;
 
-       rc = devfs_mk_dir("dasd");
-       if (rc)
-               goto failed;
        rc = dasd_devmap_init();
        if (rc)
                goto failed;

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 54ecd548c3185b1aac9a78e7343b079bce771ea9..36bc01f83a5197f8c11ecd5d1667ca6586c0d91e 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -439,8 +439,6 @@ static int __init xpram_setup_blkdev(void)
        if (rc < 0)
                goto out;
 
-       devfs_mk_dir("slram");
-
        /*
         * Assign the other needed values: make request function, sizes and
         * hardsect size. All the minor devices feature the same value.

diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index ccb20a6f5f36d7593b991d985cb8a478f704368f..03f6e988069250f5d77b760c980aa20ff96ff11e 100644 (file)
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -1031,7 +1031,6 @@ static int __init bpp_init(void)
                instances[idx].opened = 0;
                probeLptPort(idx);
        }
-       devfs_mk_dir("bpp");
        for (idx = 0; idx < BPP_NO; idx++) {
                devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),
                                S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);

diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index ddcd330b9e891a46291650b12d917f90923c5277..31232ce72071eacb702ca605467d13adae7ccbfc 100644 (file)
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -677,7 +677,6 @@ static int vfc_probe(void)
                kfree(vfc_dev_lst);
                return -EIO;
        }
-       devfs_mk_dir("vfc");
        instance = 0;
        for_all_sbusdev(sdev, sbus) {
                if (strcmp(sdev->prom_name, "vfc") == 0) {

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 31143afe7c95899303bac5571dcf833e7c26174e..93546a848f4660fc93398f5df45b0d69b08c7f82 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1432,7 +1432,6 @@ fbmem_init(void)
 {
        create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
 
-       devfs_mk_dir("fb");
        if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
                printk("unable to get major %d for fb devs\n", FB_MAJOR);
 

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 7caee8d8ea3b9a24656f40a20c247986f796d39f..a193823f9058fb0fc95a98421c139725f3c3a6ea 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -365,7 +365,6 @@ static int init_coda_psdev(void)
                err = PTR_ERR(coda_psdev_class);
                goto out_chrdev;
        }               
-       devfs_mk_dir ("coda");
        for (i = 0; i < MAX_CODADEVS; i++) {
                class_device_create(coda_psdev_class, NULL,
                                MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);

diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index d1dd876bc1a264325a2bcbc0a6af6142a83290a1..ef8766e172ef870d52b19c8feaf82ebcf1ee5f9c 100644 (file)
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -18,10 +18,6 @@ static inline int devfs_mk_symlink(const char *name, const char *link)
 {
        return 0;
 }
-static inline int devfs_mk_dir(const char *fmt, ...)
-{
-       return 0;
-}
 static inline void devfs_remove(const char *fmt, ...)
 {
 }

diff --git a/mm/shmem.c b/mm/shmem.c
index 38bc3334f2633a4bfe9ed0e40361d075ec35d8ec..a4161abb9e760805fe94939e3b3bee112c63467d 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2252,9 +2252,7 @@ static int __init init_tmpfs(void)
                printk(KERN_ERR "Could not register tmpfs\n");
                goto out2;
        }
-#ifdef CONFIG_TMPFS
-       devfs_mk_dir("shm");
-#endif
+
        shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER,
                                tmpfs_fs_type.name, NULL);
        if (IS_ERR(shm_mnt)) {

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index f9d6a9cc91c4bc806700c6119f45e34283abdeb7..11ab99b8c61fa8fe616549630c5eda81623213ec 100644 (file)
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -33,9 +33,6 @@ static int __init init_tmpfs(void)
 {
        BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
 
-#ifdef CONFIG_TMPFS
-       devfs_mk_dir("shm");
-#endif
        shm_mnt = kern_mount(&tmpfs_fs_type);
        BUG_ON(IS_ERR(shm_mnt));