[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed

Also fixes all drivers that set this field.

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

diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 0a865889b2a993ccfe409dbfd219a262a295dffc..40b44cc0d14b048523f8bbf0c6935342a6067e3e 100644 (file)
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -493,7 +493,6 @@ static struct file_operations microcode_fops = {
 static struct miscdevice microcode_dev = {
        .minor          = MICROCODE_MINOR,
        .name           = "microcode",
-       .devfs_name     = "cpu/microcode",
        .fops           = &microcode_fops,
 };
 

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 8437ea7430fe061cec70510f9f0f0bb66d2e5fb1..83a4f91bce5aefab58cfdbd06e6c27f438ac2161 100644 (file)
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -417,7 +417,6 @@ static struct file_operations sq_fops = {
 static struct miscdevice sq_dev = {
        .minor          = STORE_QUEUE_MINOR,
        .name           = "sq",
-       .devfs_name     = "cpu/sq",
        .fops           = &sq_fops,
 };
 

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a04f60693c396446d4a310e8c1df0eaef62c5012..3e4cce5e4736351befab56db81c42527223dade8 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2612,7 +2612,6 @@ static struct file_operations pkt_ctl_fops = {
 static struct miscdevice pkt_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = "pktcdvd",
-       .devfs_name     = "pktcdvd/control",
        .fops           = &pkt_ctl_fops
 };
 

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index f1fdd84c5dc53fde43d93481c2e1eaec0c082d3a..dfe1cede391602b96d155a2fdb59dd0b2eebae3f 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -227,10 +227,6 @@ int misc_register(struct miscdevice * misc)
 
        if (misc->minor < DYNAMIC_MINORS)
                misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
-       if (misc->devfs_name[0] == '\0') {
-               snprintf(misc->devfs_name, sizeof(misc->devfs_name),
-                               "misc/%s", misc->name);
-       }
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
        misc->class = class_device_create(misc_class, NULL, dev, misc->dev,

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index f25168a9676d0ade041b130203ce069966fed751..95e8122b8068d47bd617fdc7726b78eafffbdb7c 100644 (file)
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -693,7 +693,6 @@ static int __init mmtimer_init(void)
                return -1;
        }
 
-       strcpy(mmtimer_miscdev.devfs_name, MMTIMER_NAME);
        if (misc_register(&mmtimer_miscdev)) {
                printk(KERN_ERR "%s: failed to register device\n",
                       MMTIMER_NAME);

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3ad60caea7732ca07b9209e340a9c3abaf1493b0..d13bb15a8a02981f69706048d32bfc64b83b73c1 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1472,7 +1472,6 @@ static struct file_operations _ctl_fops = {
 static struct miscdevice _dm_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DM_NAME,
-       .devfs_name     = "mapper/control",
        .fops           = &_ctl_fops
 };
 

diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index 87b37b7691dad387cd082b10c030b9c0829947f3..c1b1db65e66821544b541ca37eed4d9fa2491643 100644 (file)
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -115,7 +115,6 @@ static struct file_operations rds_fops = {
 static struct miscdevice rds_miscdev = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = "radiotext",
-       .devfs_name     = "v4l/rds/radiotext",
        .fops           = &rds_fops,
 };
 

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6c62d5c882683f09267e06e9dade80f1cfb9482d..732c5edec2e5edd3cab20c8d0aa43233b8fab8c8 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -780,7 +780,6 @@ static struct miscdevice tun_miscdev = {
        .minor = TUN_MINOR,
        .name = "tun",
        .fops = &tun_fops,
-       .devfs_name = "net/tun",
 };
 
 /* ethtool interface */

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index fb7bc9e5eebc90a20c09ae40f07b3df2a4c3e950..a138b1510093cc53a6538a99c47fe020da53518a 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -586,7 +586,6 @@ static struct file_operations mon_fops = {
 
 static struct miscdevice mon_dev = {
        .name       = "monreader",
-       .devfs_name = "monreader",
        .fops       = &mon_fops,
        .minor      = MISC_DYNAMIC_MINOR,
 };

diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 982acc7303ea299c1566e8580b3027556941a516..b2f20ab8431a05c6c53ffe460e51696d720c00e0 100644 (file)
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -411,7 +411,6 @@ static struct miscdevice z90crypt_misc_device = {
        .minor      = Z90CRYPT_MINOR,
        .name       = DEV_NAME,
        .fops       = &z90crypt_fops,
-       .devfs_name = DEV_NAME
 };
 
 /**

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 5b584dafb5a6d4384f9b3169b2500d8cf0c3b518..b03cfb91e228dd993987e3b2eb497c832397e073 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -40,7 +40,6 @@ struct miscdevice  {
        struct list_head list;
        struct device *dev;
        struct class_device *class;
-       char devfs_name[64];
 };
 
 extern int misc_register(struct miscdevice * misc);