remove cdev_set_name completely as it is not needed.

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 9bc5da2b1637a63dc98b6369849395dce212b6c9..dc117f656f253e19d9a12617dc08aff5c5d81a3c 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2274,9 +2274,6 @@ int tty_register_driver(struct tty_driver *driver)
                driver->termios_locked = NULL;
        }
 
-       cdev_set_name(&driver->cdev, driver->name);
-       for (s = strchr(driver->cdev.kobj.name, '/'); s; s = strchr(s, '/'))
-               *s = '!';
        cdev_init(&driver->cdev, &tty_fops);
        driver->cdev.owner = driver->owner;
        error = cdev_add(&driver->cdev, dev, driver->num);
@@ -2414,7 +2411,6 @@ static struct cdev vc0_cdev;
  */
 static int __init tty_init(void)
 {
-       cdev_set_name(&tty_cdev, "dev.tty");
        cdev_init(&tty_cdev, &tty_fops);
        if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
@@ -2422,7 +2418,6 @@ static int __init tty_init(void)
        devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
        class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
 
-       cdev_set_name(&console_cdev, "dev.console");
        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)
@@ -2431,7 +2426,6 @@ static int __init tty_init(void)
        class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
 
 #ifdef CONFIG_UNIX98_PTYS
-       cdev_set_name(&ptmx_cdev, "dev.ptmx");
        cdev_init(&ptmx_cdev, &tty_fops);
        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
@@ -2441,7 +2435,6 @@ static int __init tty_init(void)
 #endif
 
 #ifdef CONFIG_VT
-       cdev_set_name(&vc0_cdev, "dev.vc0");
        cdev_init(&vc0_cdev, &console_fops);
        if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
            register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)

diff --git a/drivers/ieee1394/amdtp.c b/drivers/ieee1394/amdtp.c
index 5528bbc3785899acc3e28079b9ca416e534f2683..681f0ad35374199c86dd488336944a512bca40f5 100644 (file)
--- a/drivers/ieee1394/amdtp.c
+++ b/drivers/ieee1394/amdtp.c
@@ -1266,7 +1266,6 @@ static int __init amdtp_init_module (void)
 {
        cdev_init(&amdtp_cdev, &amdtp_fops);
        amdtp_cdev.owner = THIS_MODULE;
-       cdev_set_name(&amdtp_cdev, "amdtp");
        if (cdev_add(&amdtp_cdev, IEEE1394_AMDTP_DEV, 16)) {
                HPSB_ERR("amdtp: unable to add char device");
                return -EIO;

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 41ddfc00624a5d2a4e55be467281a1c311a46d4c..650ef039ac0abcedc64e9a6bb0d663ee337b6176 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2616,7 +2616,6 @@ static int __init dv1394_init_module(void)
 
        cdev_init(&dv1394_cdev, &dv1394_fops);
        dv1394_cdev.owner = THIS_MODULE;
-       cdev_set_name(&dv1394_cdev, "dv1394");
        ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
        if (ret) {
                printk(KERN_ERR "dv1394: unable to register character device\n");

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 99c0ef7f7e3f28f7499c692cec82bfd7ddeb77ed..e947f8b76a3577023e663b1d3308f6a3a937269b 100644 (file)
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2746,7 +2746,6 @@ static int __init init_raw1394(void)
 
        cdev_init(&raw1394_cdev, &raw1394_fops);
        raw1394_cdev.owner = THIS_MODULE;
-       cdev_set_name(&raw1394_cdev, RAW1394_DEVICE_NAME);
        ret = cdev_add(&raw1394_cdev, IEEE1394_RAW1394_DEV, 1);
        if (ret) {
                /* jmc: leaves reference to (static) raw1394_cdev */

diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 2a60bbcfb94ebcc3732118cc9fa8f4fa4cd8d60e..9077d6e010cba88c89eac29212e4f0d078287c41 100644 (file)
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1457,7 +1457,6 @@ static int __init video1394_init_module (void)
 
        cdev_init(&video1394_cdev, &video1394_fops);
        video1394_cdev.owner = THIS_MODULE;
-       cdev_set_name(&video1394_cdev, VIDEO1394_DRIVER_NAME);
        ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16);
        if (ret) {
                PRINT_G(KERN_ERR, "video1394: unable to get minor device block");

diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 1c53080ea069c169e0f6c9aaa4c3857bf86fb671..6ebae2022b19055d287b3571b627dde06da7137d 100644 (file)
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -46,9 +46,6 @@ struct cdev *register_tape_dev(
        cdev->owner = fops->owner;
        cdev->ops   = fops;
        cdev->dev   = dev;
-       cdev_set_name(cdev, devname);
-       for (s = strchr(cdev->kobj.name, '/'); s; s = strchr(s, '/'))
-               *s = '!';
 
        rc = cdev_add(cdev, cdev->dev, 1);
        if (rc) {

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 86dff0120e47444e3173b76f38e5da667af1c3c2..ddfa3bd7551318345f04e0bcbc546d84167d6d80 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1409,7 +1409,6 @@ find_empty_slot:
        SCSI_LOG_TIMEOUT(3, printk("sg_add: dev=%d \n", k));
        memset(sdp, 0, sizeof(*sdp));
        sprintf(disk->disk_name, "sg%d", k);
-       cdev_set_name(cdev, disk->disk_name);
        cdev->owner = THIS_MODULE;
        cdev->ops = &sg_fops;
        disk->major = SCSI_GENERIC_MAJOR;

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index f1c9aae521953f7335ebd748626a842a11d5bc1a..7341c9c4413e39fb234df049b0b6bfc8f6c691b2 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3888,7 +3888,6 @@ static int st_probe(struct device *dev)
                                       dev_num);
                                goto out_free_tape;
                        }
-                       cdev_set_name(cdev, "%sm%d%s", disk->disk_name, mode, j ? "n" : "");
                        cdev->owner = THIS_MODULE;
                        cdev->ops = &st_fops;
 

diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index b8618f9841658f5dc4db78d08199a4df9e699675..f1996ec09e9616b565b714de5689f199399e0f0f 100644 (file)
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -25,7 +25,5 @@ void cdev_del(struct cdev *);
 
 void cd_forget(struct inode *);
 
-#define cdev_set_name(cdev, args...) kobject_set_name(&((cdev)->kobj), ##args)
-
 #endif
 #endif