aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:08 -0400
commit96192ff1a9d0c6ef365d21667080259d83ea2f5b (patch)
treeb13caa3bedb3cde8bd1beecfc3c76bac894df42a
parentff23eca3e8f613034e0d20ff86f6a89b62f5a14e (diff)
[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>
-rw-r--r--arch/i386/kernel/microcode.c1
-rw-r--r--arch/sh/kernel/cpu/sh4/sq.c1
-rw-r--r--drivers/block/pktcdvd.c1
-rw-r--r--drivers/char/misc.c4
-rw-r--r--drivers/char/mmtimer.c1
-rw-r--r--drivers/md/dm-ioctl.c1
-rw-r--r--drivers/media/radio/miropcm20-rds.c1
-rw-r--r--drivers/net/tun.c1
-rw-r--r--drivers/s390/char/monreader.c1
-rw-r--r--drivers/s390/crypto/z90main.c1
-rw-r--r--include/linux/miscdevice.h1
11 files changed, 0 insertions, 14 deletions
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 0a865889b2a9..40b44cc0d14b 100644
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -493,7 +493,6 @@ static struct file_operations microcode_fops = {
493static struct miscdevice microcode_dev = { 493static struct miscdevice microcode_dev = {
494 .minor = MICROCODE_MINOR, 494 .minor = MICROCODE_MINOR,
495 .name = "microcode", 495 .name = "microcode",
496 .devfs_name = "cpu/microcode",
497 .fops = &microcode_fops, 496 .fops = &microcode_fops,
498}; 497};
499 498
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 8437ea7430fe..83a4f91bce5a 100644
--- 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 = {
417static struct miscdevice sq_dev = { 417static struct miscdevice sq_dev = {
418 .minor = STORE_QUEUE_MINOR, 418 .minor = STORE_QUEUE_MINOR,
419 .name = "sq", 419 .name = "sq",
420 .devfs_name = "cpu/sq",
421 .fops = &sq_fops, 420 .fops = &sq_fops,
422}; 421};
423 422
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a04f60693c39..3e4cce5e4736 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2612,7 +2612,6 @@ static struct file_operations pkt_ctl_fops = {
2612static struct miscdevice pkt_misc = { 2612static struct miscdevice pkt_misc = {
2613 .minor = MISC_DYNAMIC_MINOR, 2613 .minor = MISC_DYNAMIC_MINOR,
2614 .name = "pktcdvd", 2614 .name = "pktcdvd",
2615 .devfs_name = "pktcdvd/control",
2616 .fops = &pkt_ctl_fops 2615 .fops = &pkt_ctl_fops
2617}; 2616};
2618 2617
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index f1fdd84c5dc5..dfe1cede3916 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -227,10 +227,6 @@ int misc_register(struct miscdevice * misc)
227 227
228 if (misc->minor < DYNAMIC_MINORS) 228 if (misc->minor < DYNAMIC_MINORS)
229 misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7); 229 misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
230 if (misc->devfs_name[0] == '\0') {
231 snprintf(misc->devfs_name, sizeof(misc->devfs_name),
232 "misc/%s", misc->name);
233 }
234 dev = MKDEV(MISC_MAJOR, misc->minor); 230 dev = MKDEV(MISC_MAJOR, misc->minor);
235 231
236 misc->class = class_device_create(misc_class, NULL, dev, misc->dev, 232 misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index f25168a9676d..95e8122b8068 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -693,7 +693,6 @@ static int __init mmtimer_init(void)
693 return -1; 693 return -1;
694 } 694 }
695 695
696 strcpy(mmtimer_miscdev.devfs_name, MMTIMER_NAME);
697 if (misc_register(&mmtimer_miscdev)) { 696 if (misc_register(&mmtimer_miscdev)) {
698 printk(KERN_ERR "%s: failed to register device\n", 697 printk(KERN_ERR "%s: failed to register device\n",
699 MMTIMER_NAME); 698 MMTIMER_NAME);
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3ad60caea773..d13bb15a8a02 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1472,7 +1472,6 @@ static struct file_operations _ctl_fops = {
1472static struct miscdevice _dm_misc = { 1472static struct miscdevice _dm_misc = {
1473 .minor = MISC_DYNAMIC_MINOR, 1473 .minor = MISC_DYNAMIC_MINOR,
1474 .name = DM_NAME, 1474 .name = DM_NAME,
1475 .devfs_name = "mapper/control",
1476 .fops = &_ctl_fops 1475 .fops = &_ctl_fops
1477}; 1476};
1478 1477
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index 87b37b7691da..c1b1db65e668 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -115,7 +115,6 @@ static struct file_operations rds_fops = {
115static struct miscdevice rds_miscdev = { 115static struct miscdevice rds_miscdev = {
116 .minor = MISC_DYNAMIC_MINOR, 116 .minor = MISC_DYNAMIC_MINOR,
117 .name = "radiotext", 117 .name = "radiotext",
118 .devfs_name = "v4l/rds/radiotext",
119 .fops = &rds_fops, 118 .fops = &rds_fops,
120}; 119};
121 120
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6c62d5c88268..732c5edec2e5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -780,7 +780,6 @@ static struct miscdevice tun_miscdev = {
780 .minor = TUN_MINOR, 780 .minor = TUN_MINOR,
781 .name = "tun", 781 .name = "tun",
782 .fops = &tun_fops, 782 .fops = &tun_fops,
783 .devfs_name = "net/tun",
784}; 783};
785 784
786/* ethtool interface */ 785/* ethtool interface */
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index fb7bc9e5eebc..a138b1510093 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -586,7 +586,6 @@ static struct file_operations mon_fops = {
586 586
587static struct miscdevice mon_dev = { 587static struct miscdevice mon_dev = {
588 .name = "monreader", 588 .name = "monreader",
589 .devfs_name = "monreader",
590 .fops = &mon_fops, 589 .fops = &mon_fops,
591 .minor = MISC_DYNAMIC_MINOR, 590 .minor = MISC_DYNAMIC_MINOR,
592}; 591};
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 982acc7303ea..b2f20ab8431a 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -411,7 +411,6 @@ static struct miscdevice z90crypt_misc_device = {
411 .minor = Z90CRYPT_MINOR, 411 .minor = Z90CRYPT_MINOR,
412 .name = DEV_NAME, 412 .name = DEV_NAME,
413 .fops = &z90crypt_fops, 413 .fops = &z90crypt_fops,
414 .devfs_name = DEV_NAME
415}; 414};
416 415
417/** 416/**
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 5b584dafb5a6..b03cfb91e228 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -40,7 +40,6 @@ struct miscdevice {
40 struct list_head list; 40 struct list_head list;
41 struct device *dev; 41 struct device *dev;
42 struct class_device *class; 42 struct class_device *class;
43 char devfs_name[64];
44}; 43};
45 44
46extern int misc_register(struct miscdevice * misc); 45extern int misc_register(struct miscdevice * misc);