Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96192ff1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ff23eca3

arch/i386/kernel/microcode.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/sh/kernel/cpu/sh4/sq.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/block/pktcdvd.c

+0 −1
Original line number Diff line number Diff line
@@ -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

};

drivers/char/misc.c

+0 −4
Original line number Diff line number Diff line
@@ -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,

drivers/char/mmtimer.c

+0 −1
Original line number Diff line number Diff line
@@ -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);