ChangeSet 1.1502, 2004/01/19 16:41:53-08:00, greg@kroah.com [PATCH] MISC: add sysfs class support for misc devices This adds class/misc/ for all misc devices (ones that use the misc_register() function). drivers/char/misc.c | 17 +++++++++++++++-- include/linux/miscdevice.h | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff -Nru a/drivers/char/misc.c b/drivers/char/misc.c --- a/drivers/char/misc.c Mon Jan 19 17:04:53 2004 +++ b/drivers/char/misc.c Mon Jan 19 17:04:53 2004 @@ -47,7 +47,7 @@ #include #include #include - +#include #include #include @@ -180,6 +180,13 @@ return err; } +/* + * TODO for 2.7: + * - add a struct class_device to struct miscdevice and make all usages of + * them dynamic. + */ +static struct class_simple *misc_class; + static struct file_operations misc_fops = { .owner = THIS_MODULE, .open = misc_open, @@ -234,6 +241,8 @@ "misc/%s", misc->name); } + class_simple_device_add(misc_class, MKDEV(MISC_MAJOR, misc->minor), + misc->dev, misc->name); devfs_mk_cdev(MKDEV(MISC_MAJOR, misc->minor), S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, misc->devfs_name); @@ -265,6 +274,7 @@ down(&misc_sem); list_del(&misc->list); + class_simple_device_remove(MKDEV(MISC_MAJOR, misc->minor)); devfs_remove(misc->devfs_name); if (i < DYNAMIC_MINORS && i>0) { misc_minors[i>>3] &= ~(1 << (misc->minor & 7)); @@ -285,6 +295,9 @@ if (ent) ent->proc_fops = &misc_proc_fops; #endif + misc_class = class_simple_create(THIS_MODULE, "misc"); + if (IS_ERR(misc_class)) + return PTR_ERR(misc_class); #ifdef CONFIG_MVME16x rtc_MK48T08_init(); #endif @@ -319,4 +332,4 @@ } return 0; } -module_init(misc_init); +subsys_initcall(misc_init); diff -Nru a/include/linux/miscdevice.h b/include/linux/miscdevice.h --- a/include/linux/miscdevice.h Mon Jan 19 17:04:53 2004 +++ b/include/linux/miscdevice.h Mon Jan 19 17:04:53 2004 @@ -36,12 +36,15 @@ #define TUN_MINOR 200 +struct device; + struct miscdevice { int minor; const char *name; struct file_operations *fops; struct list_head list; + struct device *dev; char devfs_name[64]; };