[PATCH] devfs_mk_dir simplification

All arguments except the name are unused - remove them and make the
name printf-like to avoid a few snprintf in the surrounding code.

(also fixes compilation to due a superflous endif in dvb core)

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index f76d25a2cf66e7d48c0dc332d072ae593fc1a0b2..499406ab9d1c26021837fb969dd4ec398080a79e 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -682,7 +682,7 @@ int ubd_init(void)
 {
         int i;
 
-       ubd_dir_handle = devfs_mk_dir(NULL, "ubd", NULL);
+       ubd_dir_handle = devfs_mk_dir("ubd");
        if (register_blkdev(MAJOR_NR, "ubd"))
                return -1;
 
@@ -693,7 +693,7 @@ int ubd_init(void)
                char name[sizeof("ubd_nnn\0")];
 
                snprintf(name, sizeof(name), "ubd_%d", fake_major);
-               ubd_fake_dir_handle = devfs_mk_dir(NULL, name, NULL);
+               ubd_fake_dir_handle = 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 918b0e8cb287bce498503f1723891031b532b73f..3aa68030218c3ac1e7a7523f2bf7f7732a97c6b9 100644 (file)
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -1006,7 +1006,7 @@ int slm_init( void )
        BufferP = SLMBuffer;
        SLMState = IDLE;
        
-       devfs_mk_dir (NULL, "slm", NULL);
+       devfs_mk_dir("slm");
        for (i = 0; i < MAX_SLM; i++) {
                char name[16];
                sprintf(name, "slm/%d", i);

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 8c125708b5827995ee6e843625787897e43cf75d..91ed5814471f8561e3228fdf1faffd29a191fb82 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1679,9 +1679,8 @@ static void getgeometry(int ctlr)
 
                                }
                                if (!disk->de) {
-                                       char txt[16];
-                                       sprintf(txt,"ida/c%dd%d",ctlr,log_unit);
-                                       disk->de = devfs_mk_dir(NULL,txt,NULL);
+                                       disk->de = devfs_mk_dir("ida/c%dd%d",
+                                                       ctlr, log_unit);
                                }
                                info_p->phys_drives =
                                    sense_config_buf->ctlr_phys_drv;

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index c8b909229c5d3a451740c6450e5094ae077d3110..07643c22081768ac8bbda53bd7a24bc122c1d858 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4233,7 +4233,7 @@ int __init floppy_init(void)
                        goto Enomem;
        }
 
-       devfs_mk_dir (NULL, "floppy", NULL);
+       devfs_mk_dir ("floppy");
        if (register_blkdev(FLOPPY_MAJOR,"fd")) {
                err = -EBUSY;
                goto out;

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 349d1341c1a97b002a41e90edfd2f2058afc0703..2b9f558959b31964d5e940d4559a2f464412fad5 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1020,7 +1020,7 @@ int __init loop_init(void)
        if (register_blkdev(LOOP_MAJOR, "loop"))
                return -EIO;
 
-       devfs_mk_dir(NULL, "loop", NULL);
+       devfs_mk_dir("loop");
 
        loop_dev = kmalloc(max_loop * sizeof(struct loop_device), GFP_KERNEL);
        if (!loop_dev)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 08298857a7127fe0045943e301423394a943bf2a..c13ff60956c061e9fa28fcc8f68de135d54872af 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -565,7 +565,7 @@ static int __init nbd_init(void)
        printk("nbd: registered device at major %d\n", NBD_MAJOR);
 #endif
        blk_init_queue(&nbd_queue, do_nbd_request, &nbd_lock);
-       devfs_mk_dir (NULL, "nbd", NULL);
+       devfs_mk_dir("nbd");
        for (i = 0; i < MAX_NBD; i++) {
                struct gendisk *disk = nbd_dev[i].disk;
                char name[16];

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index a2e328d663f0f98f2cf8e53ebaa8fc0c7cc3f786..93ba59e5170c4912c7c52ab5490dd190e4b03ac8 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -642,7 +642,7 @@ static int __init pg_init(void)
                  if (PG.present) pi_release(PI);
                return -1;
        }
-       devfs_mk_dir (NULL, "pg", NULL);
+       devfs_mk_dir ("pg");
        for (unit=0; unit<PG_UNITS; unit++)
                if (PG.present) {
                        char name[16];

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index fd8cb9299dd1ede300fe27fbde008e6dba8a8737..3bded7393de2624b786f0feb37314a912db69867 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -913,7 +913,7 @@ static int __init pt_init(void)
                return -1;
        }
 
-       devfs_mk_dir (NULL, "pt", NULL);
+       devfs_mk_dir ("pt");
        for (unit=0;unit<PT_UNITS;unit++)
                if (PT.present) {
                        char name[16];

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 2bab480f3db9af84bac25a7e8611cf561ddebe3a..078386c60c2fe590bcdb2043b6731d90409a61fe 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -416,7 +416,7 @@ static int __init rd_init (void)
 
        blk_queue_make_request(&rd_queue, &rd_make_request);
 
-       devfs_mk_dir (NULL, "rd", NULL);
+       devfs_mk_dir("rd");
 
        for (i = 0; i < NUM_RAMDISKS; i++) {
                struct gendisk *disk = rd_disks[i];

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 307adb947b39a9d9a15231f2b5dbc2328b6c7b43..6f1cc8cd4dc6f90c2bf9b468e7e09f0e6ead0e81 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -979,7 +979,7 @@ int swim3_init(void)
        int err = -ENOMEM;
        int i;
 
-       floppy_devfs_handle = devfs_mk_dir(NULL, "floppy", NULL);
+       floppy_devfs_handle = devfs_mk_dir("floppy");
 
        swim = find_devices("floppy");
        while (swim && (floppy_count < MAX_FLOPPIES))

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 9de1ff737e3b56819c19646bce268a1324ef7d2e..edb915b60ceb44e8bb2eb57db229aa5ec30aa552 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1154,7 +1154,8 @@ int __init mm_init(void)
                if (!mm_gendisk[i])
                        goto out;
        }
-       devfs_mk_dir(NULL, "umem", NULL);
+
+       devfs_mk_dir("umem");
 
        for (i = 0; i < num_cards; i++) {
                struct gendisk *disk = mm_gendisk[i];

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index a3a7eb9a1969ee4f784125a040bdf3b17e8e182d..1da1122dc898fa40b5657412ac7865f528089a9b 100644 (file)
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -173,7 +173,7 @@ static int __init xd_init(void)
        if (register_blkdev(XT_DISK_MAJOR, "xd"))
                goto out1;
 
-       devfs_mk_dir(NULL, "xd", NULL);
+       devfs_mk_dir("xd");
        blk_init_queue(&xd_queue, do_xd_request, &xd_lock);
        if (xd_detect(&controller,&address)) {
 

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 367c12200fe184091e42599dbd29857247af077a..ae6787aba3db9789653a81b0d1261e047255b9ed 100644 (file)
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5805,7 +5805,7 @@ int __init sbpcd_init(void)
 
        blk_init_queue(&sbpcd_queue, do_sbpcd_request, &sbpcd_lock);
 
-       devfs_mk_dir (NULL, "sbp", NULL);
+       devfs_mk_dir("sbp");
 
        for (j=0;j<NR_SBPCD;j++)
        {

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 9724a5617c8496427ec1b776804b69f45f723889..d945698dc6ac703599e41106ea656fe95a6ba8af 100644 (file)
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -489,7 +489,7 @@ static __init int init_ipmi_devintf(void)
                ipmi_major = rv;
        }
 
-       devfs_handle = devfs_mk_dir(NULL, DEVICE_NAME, NULL);
+       devfs_handle = devfs_mk_dir(DEVICE_NAME);
 
        rv = ipmi_smi_watcher_register(&smi_watcher);
        if (rv) {

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 92e976cd67429e7dffa4ad49efb7a31f0273496b..f093d3f9838713a5d42c8113f1e7cfc4935683d0 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -5334,7 +5334,7 @@ int __init stli_init(void)
                printk(KERN_ERR "STALLION: failed to register serial memory "
                                "device\n");
 
-       devfs_mk_dir (NULL, "staliomem", NULL);
+       devfs_mk_dir("staliomem");
        for (i = 0; i < 4; i++) {
                char name[16];
                sprintf(name, "staliomem/%d", i);

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 21bda1e1b2f0351d516e7f70f45f989893b7f33c..f25ef37fd8c5bf131bb6b123678de0fd687fd94d 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -906,7 +906,7 @@ int __init lp_init (void)
                return -EIO;
        }
 
-       devfs_mk_dir (NULL, "printers", NULL);
+       devfs_mk_dir("printers");
 
        if (parport_register_driver (&lp_driver)) {
                printk (KERN_ERR "lp: unable to register with parport\n");

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 370d61c1c6adfa587860aa9df8f701e6f7a60571..e06d4dbb0fdd19127e592a597117b0d8a07a0da5 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -196,7 +196,7 @@ int misc_register(struct miscdevice * misc)
        if (misc->minor < DYNAMIC_MINORS)
                misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
        if (!devfs_handle)
-               devfs_handle = devfs_mk_dir (NULL, "misc", NULL);
+               devfs_handle = devfs_mk_dir("misc");
        dir = strchr (misc->name, '/') ? NULL : devfs_handle;
        misc->devfs_handle =
                devfs_register (dir, misc->name, DEVFS_FL_NONE,

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index ffaa9473389be52bbeb24dba8d957e1a88754b46..773f555dd989ec51f3ed8a2678e940bdb5467403 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -758,7 +758,7 @@ static int __init ppdev_init (void)
                        PP_MAJOR);
                return -EIO;
        }
-       devfs_mk_dir (NULL, "parports", NULL);
+       devfs_mk_dir("parports");
        for (i = 0; i < PARPORT_MAX; i++) {
                char name[16];
                sprintf(name, "parports/%d", i);

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 5c23c6b2ec63c084562c2e8142b1a9e7721f8ec3..83016c59b4bd2a4bb88bc3ae018add05e87de113 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -432,7 +432,7 @@ int __init pty_init(void)
 
        /* Unix98 devices */
 #ifdef CONFIG_UNIX98_PTYS
-       devfs_mk_dir (NULL, "pts", NULL);
+       devfs_mk_dir("pts");
        printk("pty: %d Unix98 ptys configured\n", UNIX98_NR_MAJORS*NR_PTYS);
        for ( i = 0 ; i < UNIX98_NR_MAJORS ; i++ ) {
                int j;

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index cb16472e3afcfcdc0c558f430047e7f6e1ac48a2..141c03bf9844638d6814e6fb25ae4401f11ebe96 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -3213,7 +3213,7 @@ 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 (NULL, "staliomem", NULL);
+       devfs_mk_dir("staliomem");
        for (i = 0; i < 4; i++) {
                char name[16];
                sprintf(name, "staliomem/%d", i);

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index d29024750be256f87771caeea8be8ed807113dff..d1158a54336d078c3e61411e6658785cbc4418c8 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -490,7 +490,7 @@ tipar_init_module(void)
        }
 
        /* Use devfs with tree: /dev/ticables/par/[0..2] */
-       devfs_mk_dir(NULL, "ticables/par", NULL);
+       devfs_mk_dir("ticables/par");
 
        if (parport_register_driver(&tipar_driver)) {
                printk("tipar: unable to register with parport\n");

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 4e69b84b609d07e0c80fd791c2e61f74d568e9fe..4b9cc6786c5154e159c19a464f3ba99e09da60f3 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -436,7 +436,7 @@ int __init i2c_dev_init(void)
                       I2C_MAJOR);
                return -EIO;
        }
-       devfs_mk_dir(NULL, "i2c", NULL);
+       devfs_mk_dir("i2c");
        if ((res = i2c_add_driver(&i2cdev_driver))) {
                printk(KERN_ERR "i2c-dev.o: Driver registration failed, module not inserted.\n");
                devfs_remove("i2c");

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index d395c891a33a4cfb89a47b5eb1df4731a3d3771b..a8bf16aca5b3e9d959c32a9ad753a9baecb2f411 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1304,7 +1304,7 @@ static void init_gendisk (ide_hwif_t *hwif)
                        hwif->channel, unit, drive->lun);
                if (drive->present) {
                        device_register(&drive->gendev);
-                       drive->de = devfs_mk_dir(NULL, name, NULL);
+                       drive->de = devfs_mk_dir(name);
                }
        }
        blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index c5d59ccfa366fe748c287609b752fad02b3f0319..d7218a30363d3d884411567ba022fea8840340a1 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2472,7 +2472,7 @@ int __init ide_init (void)
        static char banner_printed;
        if (!banner_printed) {
                printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
-               devfs_mk_dir(NULL, "ide", NULL);
+               devfs_mk_dir("ide");
                system_bus_speed = ide_system_bus_speed();
                banner_printed = 1;
        }

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index afbb69014755dac0b0ed78f9ece7a536fe6a23e4..932088e7519d942aa4862b3c73ecd956dbcc3859 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2648,12 +2648,9 @@ static void dv1394_add_host (struct hpsb_host *host)
 #endif
 
 #ifdef CONFIG_DEVFS_FS
-       snprintf(buf, sizeof(buf), "ieee1394/dv/host%d", ohci->id);
-       devfs_mk_dir(NULL, buf, NULL);
-       snprintf(buf, sizeof(buf), "ieee1394/dv/host%d/NTSC", ohci->id);
-       devfs_mk_dir(NULL, buf, NULL);
-       snprintf(buf, sizeof(buf), "ieee1394/dv/host%d/PAL", ohci->id);
-       devfs_mk_dir(NULL, buf, NULL);
+       devfs_mk_dir("ieee1394/dv/host%d", ohci->id);
+       devfs_mk_dir("ieee1394/dv/host%d/NTSC", ohci->id);
+       devfs_mk_dir("ieee1394/dv/host%d/PAL", ohci->id);
 #endif
        
        dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);
@@ -2922,7 +2919,7 @@ static int __init dv1394_init_module(void)
        }
 
 #ifdef CONFIG_DEVFS_FS
-       if (!devfs_mk_dir(NULL, "ieee1394/dv", NULL)) {
+       if (!devfs_mk_dir("ieee1394/dv")) {
                printk(KERN_ERR "dv1394: unable to create /dev/ieee1394/dv\n");
                ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_DV1394);
                return -ENOMEM;

diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index ea7c5c189d142b99c63f2005247ac9113c5219d7..c32a7896cdabaeaddbfb3c94d97de68b4b0dbdbb 100644 (file)
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -1155,7 +1155,7 @@ static int __init ieee1394_init(void)
        hpsb_packet_cache = kmem_cache_create("hpsb_packet", sizeof(struct hpsb_packet),
                                              0, 0, NULL, NULL);
 
-       ieee1394_devfs_handle = devfs_mk_dir(NULL, "ieee1394", NULL);
+       ieee1394_devfs_handle = devfs_mk_dir("ieee1394");
 
        if (register_chrdev(IEEE1394_MAJOR, "ieee1394", &ieee1394_chardev_ops)) {
                HPSB_ERR("unable to register character device major %d!\n", IEEE1394_MAJOR);

diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index b616d548b4e85308e197c524cfdd7d3fe9a028ba..d18d6fa29b6392795ba2158892a2a8844aa39362 100644 (file)
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1486,7 +1486,7 @@ static int __init video1394_init_module (void)
                return -EIO;
         }
 
-       devfs_handle = devfs_mk_dir(NULL, VIDEO1394_DRIVER_NAME, NULL);
+       devfs_handle = devfs_mk_dir(VIDEO1394_DRIVER_NAME);
 
        hl_handle = hpsb_register_highlevel (VIDEO1394_DRIVER_NAME, &hl_ops);
        if (hl_handle == NULL) {

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5f48e85e2c328c01be5058830137937b094b9635..a746aecd9f354c89aabf9fab6131718f9cb0de7b 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -699,7 +699,7 @@ static int __init input_init(void)
                return -EBUSY;
        }
 
-       input_devfs_handle = devfs_mk_dir(NULL, "input", NULL);
+       input_devfs_handle = devfs_mk_dir("input");
 
        return 0;
 }

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 44cd700f23f0d5f59ddbe25959d17f5cc001c152..0c11b691f33f548ced85c34689e7dbb4d5d7d0f4 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -2186,7 +2186,7 @@ static void isdn_init_devfs(void)
        int i;
 #  endif
 
-       devfs_mk_dir (NULL, "isdn", NULL);
+       devfs_mk_dir("isdn");
 #  ifdef CONFIG_ISDN_PPP
        for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
                char buf[16];

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 2ca8e2c5dfdbbee35c45d07a984a6f7ddbf127d4..fbc5616bac5fe61c440793fb2ad522035a3c58e3 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -56,7 +56,7 @@ int dm_hash_init(void)
 {
        init_buckets(_name_buckets);
        init_buckets(_uuid_buckets);
-       devfs_mk_dir(NULL, DM_DIR, NULL);
+       devfs_mk_dir(DM_DIR);
        return 0;
 }
 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3de804ebdfee25a4636d9554e64853628f0eccf4..b63752fdb7f401208ca4ad0745102b28ab1c2e48 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3597,7 +3597,7 @@ int __init md_init(void)
        if (register_blkdev(MAJOR_NR, "md"))
                return -1;
 
-       devfs_mk_dir(NULL, "md", NULL);
+       devfs_mk_dir("md");
        blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
                                md_probe, NULL, NULL);
        for (minor=0; minor < MAX_MD_DEVS; ++minor) {

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index e913846b0c7326a134805ec5f378588e976123cb..b855227008a84806d14ab2bc427923b6ef74582e 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -111,8 +111,6 @@ static struct file_operations dvb_device_fops =
        .owner =        THIS_MODULE,
        .open =         dvb_device_open,
 };
-#endif /* CONFIG_DVB_DEVFS_ONLY */
-
 
 
 int dvb_generic_open(struct inode *inode, struct file *file)
@@ -271,7 +269,6 @@ skip:
 
 int dvb_register_adapter(struct dvb_adapter **padap, char *name)
 {
-       char dirname[16];
        struct dvb_adapter *adap;
        int num;
 
@@ -295,8 +292,7 @@ int dvb_register_adapter(struct dvb_adapter **padap, char *name)
 
        printk ("DVB: registering new adapter (%s).\n", name);
        
-       sprintf(dirname, "dvb/adapter%d", num);
-       adap->devfs_handle = devfs_mk_dir(NULL, dirname, NULL);
+       adap->devfs_handle = devfs_mk_dir("dvb/adapter%d", num);
        adap->num = num;
 
        list_add_tail (&adap->list_head, &dvb_adapter_list);
@@ -323,7 +319,7 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
 static
 int __init init_dvbdev(void)
 {
-       dvb_devfs_handle = devfs_mk_dir (NULL, "dvb", NULL);
+       dvb_devfs_handle = devfs_mk_dir ("dvb");
 #ifndef CONFIG_DVB_DEVFS_ONLY
        if(register_chrdev(DVB_MAJOR,"DVB", &dvb_device_fops)) {
                printk("video_dev: unable to get major %d\n", DVB_MAJOR);

diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index f9b011626309669a8c746039db8e2fa509daf5fa..9883a8ea890fa5707bae7266cd8813eeab15ef66 100644 (file)
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -575,7 +575,7 @@ int __init init_mtdblock(void)
                return -EAGAIN;
 
 #ifdef CONFIG_DEVFS_FS
-       devfs_mk_dir(NULL, DEVICE_NAME, NULL);
+       devfs_mk_dir(DEVICE_NAME);
 #endif
        register_mtd_user(&notifier);
        

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 0e48d9c0e8098d549843a2c362095a8bf4e1d08a..f4d447229045f46a6e9ec15060240eb39418b821 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -497,7 +497,7 @@ static int __init init_mtdchar(void)
        }
 
 #ifdef CONFIG_DEVFS_FS
-       devfs_mk_dir(NULL, "mtd", NULL);
+       devfs_mk_dir("mtd");
 
        register_mtd_user(&notifier);
 #endif

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 6639f31f53bffa15b06b64a78be328abb241f003..efdd49fc01dedc827fbd22ad4ec7f4f6d6c008a9 100644 (file)
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -390,7 +390,7 @@ static int __init cosa_init(void)
                unregister_chrdev(cosa_major, "cosa");
                return -ENODEV;
        }
-       devfs_mk_dir (NULL, "cosa", NULL);
+       devfs_mk_dir("cosa");
        for (i=0; i<nr_cards; i++) {
                char name[16];
                sprintf(name, "cosa/%d", i);

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 7f3830e18b0fd1d6610e062ee08a17c738c9eadd..532882e2ffd989129c6c4e52aa5eabe9c0be7452 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -174,7 +174,6 @@ dasd_free_device(dasd_device_t *device)
 static inline int
 dasd_state_new_to_known(dasd_device_t *device)
 {
-       char buffer[10];
        dasd_devmap_t *devmap;
        umode_t devfs_perm;
        devfs_handle_t dir;
@@ -193,8 +192,7 @@ dasd_state_new_to_known(dasd_device_t *device)
        minor = devmap->devindex % DASD_PER_MAJOR;
 
        /* Add a proc directory and the dasd device entry to devfs. */
-       sprintf(buffer, "dasd/%04x", device->devno);
-       dir = devfs_mk_dir(NULL, buffer, NULL);
+       dir = devfs_mk_dir("dasd/%04x", device->devno);
        device->gdp->de = dir;
        if (device->ro_flag)
                devfs_perm = S_IFBLK | S_IRUSR;
@@ -2077,7 +2075,7 @@ dasd_init(void)
 
        DBF_EVENT(DBF_EMERG, "%s", "debug area created");
 
-       if (devfs_mk_dir(NULL, "dasd", NULL)) {
+       if (devfs_mk_dir("dasd")) {
                DBF_EVENT(DBF_ALERT, "%s", "no devfs");
                rc = -ENOSYS;
                goto failed;

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 727030ba524c37359f080c3b7a89de1ba7a2fc9f..2d7d1341726b582418349138bdc85d5b3614ee56 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -434,7 +434,7 @@ static int __init xpram_setup_blkdev(void)
        if (rc < 0)
                goto out;
 
-       devfs_mk_dir(NULL, "slram", NULL);
+       devfs_mk_dir("slram");
 
        /*
         * Assign the other needed values: make request function, sizes and

diff --git a/drivers/s390/char/tubfs.c b/drivers/s390/char/tubfs.c
index f1320a57abec6e07de9290959a3b1a6fa8c9cf9e..48ff543b907034b2475365c83f6fa70768d31bcf 100644 (file)
--- a/drivers/s390/char/tubfs.c
+++ b/drivers/s390/char/tubfs.c
@@ -73,7 +73,7 @@ fs3270_init(void)
                return -1;
        }
 #ifdef CONFIG_DEVFS_FS
-       fs3270_devfs_dir = devfs_mk_dir(NULL, "3270", NULL);
+       fs3270_devfs_dir = devfs_mk_dir("3270");
        fs3270_devfs_tub = 
                devfs_register(fs3270_devfs_dir, "tub", DEVFS_FL_DEFAULT,
                               IBM_FS3270_MAJOR, 0,

diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 0361f8c1f9ef2b085c887ce9bd8bee415ea61bbe..be544f551a811e990ff9c54e940a3217a38b63e1 100644 (file)
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -1049,7 +1049,7 @@ static int __init bpp_init(void)
                instances[idx].opened = 0;
                probeLptPort(idx);
        }
-       devfs_mk_dir (NULL, "bpp", NULL);
+       devfs_mk_dir("bpp");
        for (idx = 0; idx < BPP_NO; idx++) {
                char name[16];
                sprintf(name, "bpp/%d", idx);

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

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 78577c1818846f9311ae6131cd7e8f8d74c23592..0c0dbc526577768b093948b126ca1b4cd7c5e8ec 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1495,7 +1495,7 @@ static int __init init_scsi(void)
                INIT_LIST_HEAD(&done_q[i]);
 
        scsi_host_init();
-       devfs_mk_dir(NULL, "scsi", NULL);
+       devfs_mk_dir("scsi");
        open_softirq(SCSI_SOFTIRQ, scsi_softirq, NULL);
        printk(KERN_NOTICE "SCSI subsystem initialized\n");
        return 0;

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 20115e69dc0575d32f9a9785816dd2c3e5dbd2b6..a54455821ad0ebe0fd8da7fc58475696dda89a6e 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1128,8 +1128,6 @@ static void scsi_probe_lun(Scsi_Request *sreq, char *inq_result,
 static int scsi_add_lun(Scsi_Device *sdev, Scsi_Request *sreq,
                char *inq_result, int *bflags)
 {
-       char devname[64];
-
        /*
         * XXX do not save the inquiry, since it can change underneath us,
         * save just vendor/model/rev.
@@ -1230,13 +1228,10 @@ static int scsi_add_lun(Scsi_Device *sdev, Scsi_Request *sreq,
        
        scsi_device_register(sdev);
 
-       sprintf(devname, "scsi/host%d/bus%d/target%d/lun%d",
-               sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
-       if (sdev->de)
-               printk(KERN_WARNING "scsi devfs dir: \"%s\" already exists\n",
-                      devname);
-       else
-               sdev->de = devfs_mk_dir(NULL, devname, NULL);
+       sdev->de = devfs_mk_dir("scsi/host%d/bus%d/target%d/lun%d",
+                               sdev->host->host_no, sdev->channel,
+                               sdev->id, sdev->lun);
+
        /*
         * End driverfs/devfs code.
         */

diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 11845a102d1162c7cd90cf7981dc64aa8960f4c8..cc0f17cef8298e2a13157655ff45f997b3520f18 100644 (file)
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -76,7 +76,7 @@ int usb_major_init(void)
                return -EBUSY;
        }
 
-       usb_devfs_handle = devfs_mk_dir(NULL, "usb", NULL);
+       usb_devfs_handle = devfs_mk_dir("usb");
 
        return 0;
 }

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 5ec45879d78c51d9787a413f34035cd3b5f7891b..07fcdce19759b00dc9f184bf6e4ea86a0f87084d 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -774,7 +774,7 @@ static /* const */ struct usb_driver hiddev_driver = {
 
 int __init hiddev_init(void)
 {
-       hiddev_devfs_handle = devfs_mk_dir(NULL, "usb/hid", NULL);
+       hiddev_devfs_handle = devfs_mk_dir("usb/hid");
        usb_register(&hiddev_driver);
        return 0;
 }

diff --git a/drivers/usb/misc/tiglusb.c b/drivers/usb/misc/tiglusb.c
index 7ba36f37036e0c399ad0877104e77f7b42fe1d43..80d01df3e3e1ce22988c167a78c0e17c6eae5d19 100644 (file)
--- a/drivers/usb/misc/tiglusb.c
+++ b/drivers/usb/misc/tiglusb.c
@@ -478,7 +478,7 @@ tiglusb_init (void)
        }
 
        /* Use devfs, tree: /dev/ticables/usb/[0..3] */
-       devfs_mk_dir (NULL, "ticables/usb", NULL);
+       devfs_mk_dir ("ticables/usb");
 
        /* register USB module */
        result = usb_register (&tiglusb_driver);

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index d3e9b0f5b7065aeb165efcfd481667dc95ce870c..36542e2968e0332fbe5ea6ffcf8f5b0fb9bc04f3 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1274,7 +1274,7 @@ fbmem_init(void)
 
        create_proc_read_entry("fb", 0, 0, fbmem_read_proc, NULL);
 
-       devfs_mk_dir(NULL, "fb", 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/devfs/base.c b/fs/devfs/base.c
index ef39e67712ea609dd4e00c06b21e514a04b91fe9..66a65f26bce9b0c180ba92b7382937736032a2b8 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -1682,10 +1682,8 @@ int devfs_mk_symlink(const char *from, const char *to)
 
 /**
  *     devfs_mk_dir - Create a directory in the devfs namespace.
- *     @dir: The handle to the parent devfs directory entry. If this is %NULL the
  *             new name is relative to the root of the devfs.
- *     @name: The name of the entry.
- *     @info: An arbitrary pointer which will be associated with the entry.
+ *     @fmt: The name of the entry.
  *
  *     Use of this function is optional. The devfs_register() function
  *     will automatically create intermediate directories as needed. This function
@@ -1694,36 +1692,42 @@ int devfs_mk_symlink(const char *from, const char *to)
  *     On failure %NULL is returned.
  */
 
-devfs_handle_t devfs_mk_dir (devfs_handle_t dir, const char *name, void *info)
+devfs_handle_t devfs_mk_dir(const char *fmt, ...)
 {
-    int err;
-    struct devfs_entry *de, *old;
+       struct devfs_entry *dir = NULL, *de = NULL, *old;
+       char buf[64];
+       va_list args;
+       int n;
 
-    if (name == NULL)
-    {
-       PRINTK ("(): NULL name pointer\n");
-       return NULL;
-    }
-    if ( ( de = _devfs_prepare_leaf (&dir, name, MODE_DIR) ) == NULL )
-    {
-       PRINTK ("(%s): could not prepare leaf\n", name);
-       return NULL;
-    }
-    de->info = info;
-    if ( ( err = _devfs_append_entry (dir, de, &old) ) != 0 )
-    {
-       PRINTK ("(%s): could not append to dir: %p \"%s\", err: %d\n",
-               name, dir, dir->name, err);
-       devfs_put (old);
-       devfs_put (dir);
-       return NULL;
-    }
-    DPRINTK (DEBUG_REGISTER, "(%s): de: %p dir: %p \"%s\"\n",
-            name, de, dir, dir->name);
-    devfsd_notify (de, DEVFSD_NOTIFY_REGISTERED, 0);
-    devfs_put (dir);
-    return de;
-}   /*  End Function devfs_mk_dir  */
+       va_start(args, fmt);
+       n = vsnprintf(buf, 64, fmt, args);
+       if (n >= 64 || !buf[0]) {
+               printk(KERN_WARNING "%s: invalid argument.", __FUNCTION__);
+               return NULL;
+       }
+
+       de = _devfs_prepare_leaf(&dir, buf, MODE_DIR);
+       if (!de) {
+               PRINTK("(%s): could not prepare leaf\n", buf);
+               return NULL;
+       }
+
+       de->info = NULL;
+       if (_devfs_append_entry(dir, de, &old)) {
+               PRINTK("(%s): could not append to dir: %p \"%s\"\n",
+                               buf, dir, dir->name);
+               devfs_put(old);
+               goto out_put;
+       }
+       
+       DPRINTK(DEBUG_REGISTER, "(%s): de: %p dir: %p \"%s\"\n",
+                       buf, de, dir, dir->name);
+       devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED, 0);
+
+ out_put:
+       devfs_put(dir);
+       return de;
+}
 
 
 void devfs_remove(const char *fmt, ...)

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 403a8d585fa5f1df0f21946f65670ccf01d0f3db..b3dc098012d4ef13280799e524a71d861ca52f33 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -200,7 +200,7 @@ static void devfs_create_partitions(struct gendisk *dev)
                /*  Unaware driver: construct "real" directory  */
                sprintf(dirname, "../%s/disc%d", dev->disk_name,
                        dev->first_minor >> dev->minor_shift);
-               dir = devfs_mk_dir(NULL, dirname + 3, NULL);
+               dir = devfs_mk_dir(dirname + 3);
                dev->de = dir;
        }
        dev->number = devfs_alloc_unique_number (&disc_numspace);

diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index fc6357255acf6c4fa65960cd6dd4ff7695e69739..9d1d45877bc84093f5de99d40f1a48fe9597c67f 100644 (file)
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -22,8 +22,6 @@ typedef struct devfs_entry * devfs_handle_t;
 
 #ifdef CONFIG_DEVFS_FS
 
-extern void devfs_remove(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
-
 struct unique_numspace
 {
     spinlock_t init_lock;
@@ -42,8 +40,10 @@ extern devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
                                      umode_t mode, void *ops, void *info);
 extern void devfs_unregister (devfs_handle_t de);
 extern int devfs_mk_symlink (const char *name, const char *link);
-extern devfs_handle_t devfs_mk_dir (devfs_handle_t dir, const char *name,
-                                   void *info);
+extern devfs_handle_t devfs_mk_dir(const char *fmt, ...)
+       __attribute__((format (printf, 1, 2)));
+extern void devfs_remove(const char *fmt, ...)
+       __attribute__((format (printf, 1, 2)));
 extern int devfs_generate_path (devfs_handle_t de, char *path, int buflen);
 extern int devfs_register_tape (devfs_handle_t de);
 extern void devfs_unregister_tape(int num);
@@ -80,8 +80,7 @@ static inline int devfs_mk_symlink (const char *name, const char *link)
 {
     return 0;
 }
-static inline devfs_handle_t devfs_mk_dir (devfs_handle_t dir,
-                                          const char *name, void *info)
+static inline devfs_handle_t devfs_mk_dir(const char *fmt, ...)
 {
     return NULL;
 }

diff --git a/mm/shmem.c b/mm/shmem.c
index 6766a57eaeebb2bc4f0d4599aed4d303f387ae09..3db968add89c3ce316611b77de0dd500ad4f0ccb 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1882,7 +1882,7 @@ static int __init init_tmpfs(void)
                goto out2;
        }
 #ifdef CONFIG_TMPFS
-       devfs_mk_dir(NULL, "shm", NULL);
+       devfs_mk_dir("shm");
 #endif
        shm_mnt = kern_mount(&tmpfs_fs_type);
        if (IS_ERR(shm_mnt)) {

diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c
index 76cd48d6d0cb400149e9aaa17eeb5a84796d5580..d108dc9e94dec167e04fd2238db82a88aa39e328 100644 (file)
--- a/net/netlink/netlink_dev.c
+++ b/net/netlink/netlink_dev.c
@@ -198,7 +198,7 @@ int __init init_netlink(void)
                printk(KERN_ERR "netlink: unable to get major %d\n", NETLINK_MAJOR);
                return -EIO;
        }
-       devfs_mk_dir (NULL, "netlink", NULL);
+       devfs_mk_dir("netlink");
        /*  Someone tell me the official names for the uppercase ones  */
        for (i = 0; i < sizeof(entries)/sizeof(entries[0]); i++) {
                char name[20];

diff --git a/sound/core/sound.c b/sound/core/sound.c
index e8c9a706e1794f2dfac5244805afbe33af4e684d..32ec45f9a27b7be523cd4f6b54431ea8f5a2914f 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -346,7 +346,7 @@ static int __init alsa_sound_init(void)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
        devfs_handle = devfs_mk_dir(NULL, "snd", 3, NULL);
 #else
-       devfs_handle = devfs_mk_dir(NULL, "snd", NULL);
+       devfs_handle = devfs_mk_dir("snd");
 #endif
 #endif
        if (register_chrdev(major, "alsa", &snd_fops)) {

diff --git a/sound/sound_core.c b/sound/sound_core.c
index d958a30a56d41af9694e2984143fc8569c492598..947e4133a35b8bd3bc86c258d3e5d5ff2fe3bfb5 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -567,7 +567,7 @@ static int __init init_soundcore(void)
                printk(KERN_ERR "soundcore: sound device already in use.\n");
                return -EBUSY;
        }
-       devfs_mk_dir (NULL, "sound", NULL);
+       devfs_mk_dir ("sound");
 
        return 0;
 }