diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:08 -0400 |
commit | 96192ff1a9d0c6ef365d21667080259d83ea2f5b (patch) | |
tree | b13caa3bedb3cde8bd1beecfc3c76bac894df42a /drivers/char | |
parent | ff23eca3e8f613034e0d20ff86f6a89b62f5a14e (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>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/misc.c | 4 | ||||
-rw-r--r-- | drivers/char/mmtimer.c | 1 |
2 files changed, 0 insertions, 5 deletions
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); |