projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] at1700 section fix
[linux-2.6-block.git]
/
drivers
/
char
/
misc.c
diff --git
a/drivers/char/misc.c
b/drivers/char/misc.c
index 3e4c0414a01a2177d3a1d40638a5dc6b34aa5437..62ebe09656e3ad68b18992a0c0e4a8557c9f7992 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,
@@
-129,7
+127,7
@@
static int misc_open(struct inode * inode, struct file * file)
int minor = iminor(inode);
struct miscdevice *c;
int err = -ENODEV;
int minor = iminor(inode);
struct miscdevice *c;
int err = -ENODEV;
- struct file_operations *old_fops, *new_fops = NULL;
+
const
struct file_operations *old_fops, *new_fops = NULL;
down(&misc_sem);
down(&misc_sem);
@@
-178,7
+176,7
@@
fail:
*/
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
+202,7
@@
int misc_register(struct miscdevice * misc)
{
struct miscdevice *c;
dev_t dev;
{
struct miscdevice *c;
dev_t dev;
- int err;
+ int err
= 0
;
down(&misc_sem);
list_for_each_entry(c, &misc_list, list) {
down(&misc_sem);
list_for_each_entry(c, &misc_list, list) {
@@
-228,10
+226,6
@@
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);
misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
dev = MKDEV(MISC_MAJOR, misc->minor);
misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
@@
-241,13
+235,6
@@
int misc_register(struct miscdevice * misc)
goto out;
}
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);
- goto out;
- }
-
/*
* Add it to the front, so that later devices can "override"
* earlier defaults
/*
* Add it to the front, so that later devices can "override"
* earlier defaults
@@
-278,7
+265,6
@@
int misc_deregister(struct miscdevice * misc)
down(&misc_sem);
list_del(&misc->list);
class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
down(&misc_sem);
list_del(&misc->list);
class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
- devfs_remove(misc->devfs_name);
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));
}