Commit 96192ff1a9d0c6ef365d21667080259d83ea2f5b

Authored by Greg Kroah-Hartman
1 parent ff23eca3e8

[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>

Showing 11 changed files with 0 additions and 14 deletions Side-by-side Diff

arch/i386/kernel/microcode.c
... ... @@ -493,7 +493,6 @@
493 493 static struct miscdevice microcode_dev = {
494 494 .minor = MICROCODE_MINOR,
495 495 .name = "microcode",
496   - .devfs_name = "cpu/microcode",
497 496 .fops = &microcode_fops,
498 497 };
499 498  
arch/sh/kernel/cpu/sh4/sq.c
... ... @@ -417,7 +417,6 @@
417 417 static struct miscdevice sq_dev = {
418 418 .minor = STORE_QUEUE_MINOR,
419 419 .name = "sq",
420   - .devfs_name = "cpu/sq",
421 420 .fops = &sq_fops,
422 421 };
423 422  
drivers/block/pktcdvd.c
... ... @@ -2612,7 +2612,6 @@
2612 2612 static struct miscdevice pkt_misc = {
2613 2613 .minor = MISC_DYNAMIC_MINOR,
2614 2614 .name = "pktcdvd",
2615   - .devfs_name = "pktcdvd/control",
2616 2615 .fops = &pkt_ctl_fops
2617 2616 };
2618 2617  
... ... @@ -227,10 +227,6 @@
227 227  
228 228 if (misc->minor < DYNAMIC_MINORS)
229 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 230 dev = MKDEV(MISC_MAJOR, misc->minor);
235 231  
236 232 misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
drivers/char/mmtimer.c
... ... @@ -693,7 +693,6 @@
693 693 return -1;
694 694 }
695 695  
696   - strcpy(mmtimer_miscdev.devfs_name, MMTIMER_NAME);
697 696 if (misc_register(&mmtimer_miscdev)) {
698 697 printk(KERN_ERR "%s: failed to register device\n",
699 698 MMTIMER_NAME);
drivers/md/dm-ioctl.c
... ... @@ -1472,7 +1472,6 @@
1472 1472 static struct miscdevice _dm_misc = {
1473 1473 .minor = MISC_DYNAMIC_MINOR,
1474 1474 .name = DM_NAME,
1475   - .devfs_name = "mapper/control",
1476 1475 .fops = &_ctl_fops
1477 1476 };
1478 1477  
drivers/media/radio/miropcm20-rds.c
... ... @@ -115,7 +115,6 @@
115 115 static struct miscdevice rds_miscdev = {
116 116 .minor = MISC_DYNAMIC_MINOR,
117 117 .name = "radiotext",
118   - .devfs_name = "v4l/rds/radiotext",
119 118 .fops = &rds_fops,
120 119 };
121 120  
... ... @@ -780,7 +780,6 @@
780 780 .minor = TUN_MINOR,
781 781 .name = "tun",
782 782 .fops = &tun_fops,
783   - .devfs_name = "net/tun",
784 783 };
785 784  
786 785 /* ethtool interface */
drivers/s390/char/monreader.c
... ... @@ -586,7 +586,6 @@
586 586  
587 587 static struct miscdevice mon_dev = {
588 588 .name = "monreader",
589   - .devfs_name = "monreader",
590 589 .fops = &mon_fops,
591 590 .minor = MISC_DYNAMIC_MINOR,
592 591 };
drivers/s390/crypto/z90main.c
... ... @@ -411,7 +411,6 @@
411 411 .minor = Z90CRYPT_MINOR,
412 412 .name = DEV_NAME,
413 413 .fops = &z90crypt_fops,
414   - .devfs_name = DEV_NAME
415 414 };
416 415  
417 416 /**
include/linux/miscdevice.h
... ... @@ -40,7 +40,6 @@
40 40 struct list_head list;
41 41 struct device *dev;
42 42 struct class_device *class;
43   - char devfs_name[64];
44 43 };
45 44  
46 45 extern int misc_register(struct miscdevice * misc);