diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 09:07:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 09:07:01 -0300 |
| commit | 1022e152b0486dbbc19e49c9bbbdec12a0637418 (patch) | |
| tree | 76336142525555327148edf48612ac862266deab | |
| parent | ccc9a7ea538fa702d897eead24eefc64bd4960d9 (diff) | |
| download | mediapointer-dvb-s2-1022e152b0486dbbc19e49c9bbbdec12a0637418.tar.gz mediapointer-dvb-s2-1022e152b0486dbbc19e49c9bbbdec12a0637418.tar.bz2 | |
[PATCH] mark f_ops const in the inode
From: Arjan van de Ven <arjan@infradead.org>
Mark the f_ops members of inodes as const, as well as fix the
ripple-through this causes by places that copy this f_ops and then "do
stuff" with it.
kernel-sync
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 123ea8344..85d6a6c65 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -93,7 +93,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) if (dvbdev && dvbdev->fops) { int err = 0; - struct file_operations *old_fops; + const struct file_operations *old_fops; file->private_data = dvbdev; old_fops = file->f_op; diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index 8747de34a..e54b8d9f7 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -111,7 +111,7 @@ static int video_open(struct inode *inode, struct file *file) unsigned int minor = iminor(inode); int err = 0; struct video_device *vfl; - struct file_operations *old_fops; + const struct file_operations *old_fops; if(minor>=VIDEO_NUM_DEVICES) return -ENODEV; diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index b87334d72..922980c61 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -84,7 +84,7 @@ struct video_device int minor; /* device ops + callbacks */ - struct file_operations *fops; + const struct file_operations *fops; void (*release)(struct video_device *vfd); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) |