git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
misc.c
diff --git
a/drivers/char/misc.c
b/drivers/char/misc.c
index
96eb2a7
..
7e975f6
100644
(file)
--- a/
drivers/char/misc.c
+++ b/
drivers/char/misc.c
@@
-34,7
+34,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/errno.h>
@@
-44,7
+43,6
@@
#include <linux/slab.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/stat.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/stat.h>
#include <linux/init.h>
#include <linux/device.h>
@@
-115,7
+113,7
@@
static int misc_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &misc_seq_ops);
}
return seq_open(file, &misc_seq_ops);
}
-static struct file_operations misc_proc_fops = {
+static
const
struct file_operations misc_proc_fops = {
.owner = THIS_MODULE,
.open = misc_seq_open,
.read = seq_read,
.owner = THIS_MODULE,
.open = misc_seq_open,
.read = seq_read,
@@
-171,14
+169,9
@@
fail:
return err;
}
return err;
}
-/*
- * TODO for 2.7:
- * - add a struct kref to struct miscdevice and make all usages of
- * them dynamic.
- */
static struct class *misc_class;
static struct class *misc_class;
-static struct file_operations misc_fops = {
+static
const
struct file_operations misc_fops = {
.owner = THIS_MODULE,
.open = misc_open,
};
.owner = THIS_MODULE,
.open = misc_open,
};
@@
-204,7
+197,9
@@
int misc_register(struct miscdevice * misc)
{
struct miscdevice *c;
dev_t dev;
{
struct miscdevice *c;
dev_t dev;
- int err;
+ int err = 0;
+
+ INIT_LIST_HEAD(&misc->list);
down(&misc_sem);
list_for_each_entry(c, &misc_list, list) {
down(&misc_sem);
list_for_each_entry(c, &misc_list, list) {
@@
-228,23
+223,12
@@
int misc_register(struct miscdevice * misc)
if (misc->minor < DYNAMIC_MINORS)
misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
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);
dev = MKDEV(MISC_MAJOR, misc->minor);
- misc->
class = class_device_create(misc_class, NULL, dev, misc->
dev,
+ misc->
this_device = device_create(misc_class, misc->parent,
dev,
"%s", misc->name);
"%s", misc->name);
- if (IS_ERR(misc->class)) {
- err = PTR_ERR(misc->class);
- goto out;
- }
-
- err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP,
- misc->devfs_name);
- if (err) {
- class_device_destroy(misc_class, dev);
+ if (IS_ERR(misc->this_device)) {
+ err = PTR_ERR(misc->this_device);
goto out;
}
goto out;
}
@@
-277,8
+261,7
@@
int misc_deregister(struct miscdevice * misc)
down(&misc_sem);
list_del(&misc->list);
down(&misc_sem);
list_del(&misc->list);
- class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
- devfs_remove(misc->devfs_name);
+ device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
if (i < DYNAMIC_MINORS && i>0) {
misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
}
if (i < DYNAMIC_MINORS && i>0) {
misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
}