[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>
This commit is contained in:
parent
ff23eca3e8
commit
96192ff1a9
@ -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 = µcode_fops,
|
||||
};
|
||||
|
||||
|
@ -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,
|
||||
};
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
@ -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,
|
||||
};
|
||||
|
||||
|
@ -780,7 +780,6 @@ static struct miscdevice tun_miscdev = {
|
||||
.minor = TUN_MINOR,
|
||||
.name = "tun",
|
||||
.fops = &tun_fops,
|
||||
.devfs_name = "net/tun",
|
||||
};
|
||||
|
||||
/* ethtool interface */
|
||||
|
@ -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,
|
||||
};
|
||||
|
@ -411,7 +411,6 @@ static struct miscdevice z90crypt_misc_device = {
|
||||
.minor = Z90CRYPT_MINOR,
|
||||
.name = DEV_NAME,
|
||||
.fops = &z90crypt_fops,
|
||||
.devfs_name = DEV_NAME
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user