diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2007-02-12 03:55:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:45 -0500 |
commit | fa027c2a0a0d6d1df6b29ee99048502c93da0dd4 (patch) | |
tree | 64a6b20c6c6e19a731882f830bd70ca5c8d99943 /drivers/media/video | |
parent | 2b8693c0617e972fc0b2fd1ebf8de97e15b656c3 (diff) |
[PATCH] mark struct file_operations const 4
Many struct file_operations in the kernel can be "const". Marking them const
moves these to the .rodata section, which avoids false sharing with potential
dirty data. In addition it'll catch accidental writes at compile time to
these shared resources.
[akpm@sdl.org: dvb fix]
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media/video')
39 files changed, 50 insertions, 50 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 4861799eb430..649f52f9ad27 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -742,7 +742,7 @@ void ar_release(struct video_device *vfd) | |||
742 | * Video4Linux Module functions | 742 | * Video4Linux Module functions |
743 | * | 743 | * |
744 | ****************************************************************************/ | 744 | ****************************************************************************/ |
745 | static struct file_operations ar_fops = { | 745 | static const struct file_operations ar_fops = { |
746 | .owner = THIS_MODULE, | 746 | .owner = THIS_MODULE, |
747 | .open = video_exclusive_open, | 747 | .open = video_exclusive_open, |
748 | .release = video_exclusive_release, | 748 | .release = video_exclusive_release, |
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index ab8f970760f2..41fd09d7d11e 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3174,7 +3174,7 @@ bttv_mmap(struct file *file, struct vm_area_struct *vma) | |||
3174 | return videobuf_mmap_mapper(bttv_queue(fh),vma); | 3174 | return videobuf_mmap_mapper(bttv_queue(fh),vma); |
3175 | } | 3175 | } |
3176 | 3176 | ||
3177 | static struct file_operations bttv_fops = | 3177 | static const struct file_operations bttv_fops = |
3178 | { | 3178 | { |
3179 | .owner = THIS_MODULE, | 3179 | .owner = THIS_MODULE, |
3180 | .open = bttv_open, | 3180 | .open = bttv_open, |
@@ -3332,7 +3332,7 @@ static unsigned int radio_poll(struct file *file, poll_table *wait) | |||
3332 | return cmd.result; | 3332 | return cmd.result; |
3333 | } | 3333 | } |
3334 | 3334 | ||
3335 | static struct file_operations radio_fops = | 3335 | static const struct file_operations radio_fops = |
3336 | { | 3336 | { |
3337 | .owner = THIS_MODULE, | 3337 | .owner = THIS_MODULE, |
3338 | .open = radio_open, | 3338 | .open = radio_open, |
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index 7d0b6e59c6e2..7d47cbe6ad25 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
@@ -871,7 +871,7 @@ static ssize_t qcam_read(struct file *file, char __user *buf, | |||
871 | return len; | 871 | return len; |
872 | } | 872 | } |
873 | 873 | ||
874 | static struct file_operations qcam_fops = { | 874 | static const struct file_operations qcam_fops = { |
875 | .owner = THIS_MODULE, | 875 | .owner = THIS_MODULE, |
876 | .open = video_exclusive_open, | 876 | .open = video_exclusive_open, |
877 | .release = video_exclusive_release, | 877 | .release = video_exclusive_release, |
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index a3989bd2f81b..925ff17efbbc 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
@@ -684,7 +684,7 @@ static ssize_t qcam_read(struct file *file, char __user *buf, | |||
684 | } | 684 | } |
685 | 685 | ||
686 | /* video device template */ | 686 | /* video device template */ |
687 | static struct file_operations qcam_fops = { | 687 | static const struct file_operations qcam_fops = { |
688 | .owner = THIS_MODULE, | 688 | .owner = THIS_MODULE, |
689 | .open = video_exclusive_open, | 689 | .open = video_exclusive_open, |
690 | .release = video_exclusive_release, | 690 | .release = video_exclusive_release, |
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 3083c8075d13..fb1410c6f864 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1715,7 +1715,7 @@ static void cafe_v4l_dev_release(struct video_device *vd) | |||
1715 | * clone it for specific real devices. | 1715 | * clone it for specific real devices. |
1716 | */ | 1716 | */ |
1717 | 1717 | ||
1718 | static struct file_operations cafe_v4l_fops = { | 1718 | static const struct file_operations cafe_v4l_fops = { |
1719 | .owner = THIS_MODULE, | 1719 | .owner = THIS_MODULE, |
1720 | .open = cafe_v4l_open, | 1720 | .open = cafe_v4l_open, |
1721 | .release = cafe_v4l_release, | 1721 | .release = cafe_v4l_release, |
@@ -1969,7 +1969,7 @@ static ssize_t cafe_dfs_read_regs(struct file *file, | |||
1969 | s - cafe_debug_buf); | 1969 | s - cafe_debug_buf); |
1970 | } | 1970 | } |
1971 | 1971 | ||
1972 | static struct file_operations cafe_dfs_reg_ops = { | 1972 | static const struct file_operations cafe_dfs_reg_ops = { |
1973 | .owner = THIS_MODULE, | 1973 | .owner = THIS_MODULE, |
1974 | .read = cafe_dfs_read_regs, | 1974 | .read = cafe_dfs_read_regs, |
1975 | .open = cafe_dfs_open | 1975 | .open = cafe_dfs_open |
@@ -1995,7 +1995,7 @@ static ssize_t cafe_dfs_read_cam(struct file *file, | |||
1995 | s - cafe_debug_buf); | 1995 | s - cafe_debug_buf); |
1996 | } | 1996 | } |
1997 | 1997 | ||
1998 | static struct file_operations cafe_dfs_cam_ops = { | 1998 | static const struct file_operations cafe_dfs_cam_ops = { |
1999 | .owner = THIS_MODULE, | 1999 | .owner = THIS_MODULE, |
2000 | .read = cafe_dfs_read_cam, | 2000 | .read = cafe_dfs_read_cam, |
2001 | .open = cafe_dfs_open | 2001 | .open = cafe_dfs_open |
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 3b31a0dd2f0c..7e8d5ef58b61 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -3791,7 +3791,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma) | |||
3791 | return 0; | 3791 | return 0; |
3792 | } | 3792 | } |
3793 | 3793 | ||
3794 | static struct file_operations cpia_fops = { | 3794 | static const struct file_operations cpia_fops = { |
3795 | .owner = THIS_MODULE, | 3795 | .owner = THIS_MODULE, |
3796 | .open = cpia_open, | 3796 | .open = cpia_open, |
3797 | .release = cpia_close, | 3797 | .release = cpia_close, |
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index d09f49950f2a..1bda7ad9de11 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1924,7 +1924,7 @@ static void reset_camera_struct_v4l(struct camera_data *cam) | |||
1924 | /*** | 1924 | /*** |
1925 | * The v4l video device structure initialized for this device | 1925 | * The v4l video device structure initialized for this device |
1926 | ***/ | 1926 | ***/ |
1927 | static struct file_operations fops_template = { | 1927 | static const struct file_operations fops_template = { |
1928 | .owner = THIS_MODULE, | 1928 | .owner = THIS_MODULE, |
1929 | .open = cpia2_open, | 1929 | .open = cpia2_open, |
1930 | .release = cpia2_close, | 1930 | .release = cpia2_close, |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 0cf0360588e6..9a7a2996f20f 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -1051,7 +1051,7 @@ mpeg_mmap(struct file *file, struct vm_area_struct * vma) | |||
1051 | return videobuf_mmap_mapper(&fh->mpegq, vma); | 1051 | return videobuf_mmap_mapper(&fh->mpegq, vma); |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | static struct file_operations mpeg_fops = | 1054 | static const struct file_operations mpeg_fops = |
1055 | { | 1055 | { |
1056 | .owner = THIS_MODULE, | 1056 | .owner = THIS_MODULE, |
1057 | .open = mpeg_open, | 1057 | .open = mpeg_open, |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 8613378428fd..c86a7e06235b 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1808,7 +1808,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id) | |||
1808 | /* ----------------------------------------------------------- */ | 1808 | /* ----------------------------------------------------------- */ |
1809 | /* exported stuff */ | 1809 | /* exported stuff */ |
1810 | 1810 | ||
1811 | static struct file_operations video_fops = | 1811 | static const struct file_operations video_fops = |
1812 | { | 1812 | { |
1813 | .owner = THIS_MODULE, | 1813 | .owner = THIS_MODULE, |
1814 | .open = video_open, | 1814 | .open = video_open, |
@@ -1839,7 +1839,7 @@ static struct video_device cx8800_vbi_template = | |||
1839 | .minor = -1, | 1839 | .minor = -1, |
1840 | }; | 1840 | }; |
1841 | 1841 | ||
1842 | static struct file_operations radio_fops = | 1842 | static const struct file_operations radio_fops = |
1843 | { | 1843 | { |
1844 | .owner = THIS_MODULE, | 1844 | .owner = THIS_MODULE, |
1845 | .open = video_open, | 1845 | .open = video_open, |
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 917021fc2993..ff4b238090ac 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -696,7 +696,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm | |||
696 | return ret; | 696 | return ret; |
697 | } | 697 | } |
698 | 698 | ||
699 | static struct file_operations dabusb_fops = | 699 | static const struct file_operations dabusb_fops = |
700 | { | 700 | { |
701 | .owner = THIS_MODULE, | 701 | .owner = THIS_MODULE, |
702 | .llseek = no_llseek, | 702 | .llseek = no_llseek, |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 36e72c207a8f..bec67609500f 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1480,7 +1480,7 @@ static int em28xx_v4l2_ioctl(struct inode *inode, struct file *filp, | |||
1480 | return ret; | 1480 | return ret; |
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | static struct file_operations em28xx_v4l_fops = { | 1483 | static const struct file_operations em28xx_v4l_fops = { |
1484 | .owner = THIS_MODULE, | 1484 | .owner = THIS_MODULE, |
1485 | .open = em28xx_v4l2_open, | 1485 | .open = em28xx_v4l2_open, |
1486 | .release = em28xx_v4l2_close, | 1486 | .release = em28xx_v4l2_close, |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 86e353b26b53..49792ae8c61c 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
@@ -2454,7 +2454,7 @@ static int et61x251_ioctl(struct inode* inode, struct file* filp, | |||
2454 | } | 2454 | } |
2455 | 2455 | ||
2456 | 2456 | ||
2457 | static struct file_operations et61x251_fops = { | 2457 | static const struct file_operations et61x251_fops = { |
2458 | .owner = THIS_MODULE, | 2458 | .owner = THIS_MODULE, |
2459 | .open = et61x251_open, | 2459 | .open = et61x251_open, |
2460 | .release = et61x251_release, | 2460 | .release = et61x251_release, |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 616a35da191d..9528e10c2828 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1748,7 +1748,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) | |||
1748 | return 0; | 1748 | return 0; |
1749 | } | 1749 | } |
1750 | 1750 | ||
1751 | static struct file_operations meye_fops = { | 1751 | static const struct file_operations meye_fops = { |
1752 | .owner = THIS_MODULE, | 1752 | .owner = THIS_MODULE, |
1753 | .open = meye_open, | 1753 | .open = meye_open, |
1754 | .release = meye_release, | 1754 | .release = meye_release, |
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index b4db2cbb5a84..e5edff1059a2 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
@@ -4653,7 +4653,7 @@ ov51x_v4l1_mmap(struct file *file, struct vm_area_struct *vma) | |||
4653 | return 0; | 4653 | return 0; |
4654 | } | 4654 | } |
4655 | 4655 | ||
4656 | static struct file_operations ov511_fops = { | 4656 | static const struct file_operations ov511_fops = { |
4657 | .owner = THIS_MODULE, | 4657 | .owner = THIS_MODULE, |
4658 | .open = ov51x_v4l1_open, | 4658 | .open = ov51x_v4l1_open, |
4659 | .release = ov51x_v4l1_close, | 4659 | .release = ov51x_v4l1_close, |
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 5d681fa8bcb1..d38d3dc4a012 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c | |||
@@ -881,7 +881,7 @@ static ssize_t pms_read(struct file *file, char __user *buf, | |||
881 | return len; | 881 | return len; |
882 | } | 882 | } |
883 | 883 | ||
884 | static struct file_operations pms_fops = { | 884 | static const struct file_operations pms_fops = { |
885 | .owner = THIS_MODULE, | 885 | .owner = THIS_MODULE, |
886 | .open = video_exclusive_open, | 886 | .open = video_exclusive_open, |
887 | .release = video_exclusive_release, | 887 | .release = video_exclusive_release, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index bb40e9085977..6cf17080eb49 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -986,7 +986,7 @@ static unsigned int pvr2_v4l2_poll(struct file *file, poll_table *wait) | |||
986 | } | 986 | } |
987 | 987 | ||
988 | 988 | ||
989 | static struct file_operations vdev_fops = { | 989 | static const struct file_operations vdev_fops = { |
990 | .owner = THIS_MODULE, | 990 | .owner = THIS_MODULE, |
991 | .open = pvr2_v4l2_open, | 991 | .open = pvr2_v4l2_open, |
992 | .release = pvr2_v4l2_release, | 992 | .release = pvr2_v4l2_release, |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index a996aad79276..9825fd348108 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -152,7 +152,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file, | |||
152 | unsigned int ioctlnr, unsigned long arg); | 152 | unsigned int ioctlnr, unsigned long arg); |
153 | static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma); | 153 | static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma); |
154 | 154 | ||
155 | static struct file_operations pwc_fops = { | 155 | static const struct file_operations pwc_fops = { |
156 | .owner = THIS_MODULE, | 156 | .owner = THIS_MODULE, |
157 | .open = pwc_video_open, | 157 | .open = pwc_video_open, |
158 | .release = pwc_video_close, | 158 | .release = pwc_video_close, |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 77bb940a1a4f..0b5d159895bf 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -817,7 +817,7 @@ static void __exit cleanup_saa_5246a (void) | |||
817 | module_init(init_saa_5246a); | 817 | module_init(init_saa_5246a); |
818 | module_exit(cleanup_saa_5246a); | 818 | module_exit(cleanup_saa_5246a); |
819 | 819 | ||
820 | static struct file_operations saa_fops = { | 820 | static const struct file_operations saa_fops = { |
821 | .owner = THIS_MODULE, | 821 | .owner = THIS_MODULE, |
822 | .open = saa5246a_open, | 822 | .open = saa5246a_open, |
823 | .release = saa5246a_release, | 823 | .release = saa5246a_release, |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index bb3fb4387f65..3e84737878a8 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -699,7 +699,7 @@ static void __exit cleanup_saa_5249 (void) | |||
699 | module_init(init_saa_5249); | 699 | module_init(init_saa_5249); |
700 | module_exit(cleanup_saa_5249); | 700 | module_exit(cleanup_saa_5249); |
701 | 701 | ||
702 | static struct file_operations saa_fops = { | 702 | static const struct file_operations saa_fops = { |
703 | .owner = THIS_MODULE, | 703 | .owner = THIS_MODULE, |
704 | .open = saa5249_open, | 704 | .open = saa5249_open, |
705 | .release = saa5249_release, | 705 | .release = saa5249_release, |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index daaae870a2c4..f521603482ca 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -319,7 +319,7 @@ static int ts_ioctl(struct inode *inode, struct file *file, | |||
319 | return video_usercopy(inode, file, cmd, arg, ts_do_ioctl); | 319 | return video_usercopy(inode, file, cmd, arg, ts_do_ioctl); |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct file_operations ts_fops = | 322 | static const struct file_operations ts_fops = |
323 | { | 323 | { |
324 | .owner = THIS_MODULE, | 324 | .owner = THIS_MODULE, |
325 | .open = ts_open, | 325 | .open = ts_open, |
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index bfcb860d14cc..72444f039e3d 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -563,7 +563,7 @@ static unsigned int dsp_poll(struct file *file, struct poll_table_struct *wait) | |||
563 | return mask; | 563 | return mask; |
564 | } | 564 | } |
565 | 565 | ||
566 | struct file_operations saa7134_dsp_fops = { | 566 | const struct file_operations saa7134_dsp_fops = { |
567 | .owner = THIS_MODULE, | 567 | .owner = THIS_MODULE, |
568 | .open = dsp_open, | 568 | .open = dsp_open, |
569 | .release = dsp_release, | 569 | .release = dsp_release, |
@@ -804,7 +804,7 @@ static int mixer_ioctl(struct inode *inode, struct file *file, | |||
804 | } | 804 | } |
805 | } | 805 | } |
806 | 806 | ||
807 | struct file_operations saa7134_mixer_fops = { | 807 | const struct file_operations saa7134_mixer_fops = { |
808 | .owner = THIS_MODULE, | 808 | .owner = THIS_MODULE, |
809 | .open = mixer_open, | 809 | .open = mixer_open, |
810 | .release = mixer_release, | 810 | .release = mixer_release, |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 830617ea81cc..f2cb63053041 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -2336,7 +2336,7 @@ static int radio_ioctl(struct inode *inode, struct file *file, | |||
2336 | return video_usercopy(inode, file, cmd, arg, radio_do_ioctl); | 2336 | return video_usercopy(inode, file, cmd, arg, radio_do_ioctl); |
2337 | } | 2337 | } |
2338 | 2338 | ||
2339 | static struct file_operations video_fops = | 2339 | static const struct file_operations video_fops = |
2340 | { | 2340 | { |
2341 | .owner = THIS_MODULE, | 2341 | .owner = THIS_MODULE, |
2342 | .open = video_open, | 2342 | .open = video_open, |
@@ -2349,7 +2349,7 @@ static struct file_operations video_fops = | |||
2349 | .llseek = no_llseek, | 2349 | .llseek = no_llseek, |
2350 | }; | 2350 | }; |
2351 | 2351 | ||
2352 | static struct file_operations radio_fops = | 2352 | static const struct file_operations radio_fops = |
2353 | { | 2353 | { |
2354 | .owner = THIS_MODULE, | 2354 | .owner = THIS_MODULE, |
2355 | .open = video_open, | 2355 | .open = video_open, |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index e88ad7b40c47..88cd1297df13 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -683,8 +683,8 @@ int saa_dsp_writel(struct saa7134_dev *dev, int reg, u32 value); | |||
683 | /* ----------------------------------------------------------- */ | 683 | /* ----------------------------------------------------------- */ |
684 | /* saa7134-oss.c */ | 684 | /* saa7134-oss.c */ |
685 | 685 | ||
686 | extern struct file_operations saa7134_dsp_fops; | 686 | extern const struct file_operations saa7134_dsp_fops; |
687 | extern struct file_operations saa7134_mixer_fops; | 687 | extern const struct file_operations saa7134_mixer_fops; |
688 | 688 | ||
689 | int saa7134_oss_init1(struct saa7134_dev *dev); | 689 | int saa7134_oss_init1(struct saa7134_dev *dev); |
690 | int saa7134_oss_fini(struct saa7134_dev *dev); | 690 | int saa7134_oss_fini(struct saa7134_dev *dev); |
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index 7aeec574d7ce..038448f5a978 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -1185,7 +1185,7 @@ static int se401_mmap(struct file *file, struct vm_area_struct *vma) | |||
1185 | return 0; | 1185 | return 0; |
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | static struct file_operations se401_fops = { | 1188 | static const struct file_operations se401_fops = { |
1189 | .owner = THIS_MODULE, | 1189 | .owner = THIS_MODULE, |
1190 | .open = se401_open, | 1190 | .open = se401_open, |
1191 | .release = se401_close, | 1191 | .release = se401_close, |
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 18458d46c0ff..04d4c8f28b89 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -2736,7 +2736,7 @@ static int sn9c102_ioctl(struct inode* inode, struct file* filp, | |||
2736 | 2736 | ||
2737 | /*****************************************************************************/ | 2737 | /*****************************************************************************/ |
2738 | 2738 | ||
2739 | static struct file_operations sn9c102_fops = { | 2739 | static const struct file_operations sn9c102_fops = { |
2740 | .owner = THIS_MODULE, | 2740 | .owner = THIS_MODULE, |
2741 | .open = sn9c102_open, | 2741 | .open = sn9c102_open, |
2742 | .release = sn9c102_release, | 2742 | .release = sn9c102_release, |
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index 525d81288d55..3e736be5de84 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -1901,7 +1901,7 @@ static int saa_release(struct inode *inode, struct file *file) | |||
1901 | return 0; | 1901 | return 0; |
1902 | } | 1902 | } |
1903 | 1903 | ||
1904 | static struct file_operations saa_fops = { | 1904 | static const struct file_operations saa_fops = { |
1905 | .owner = THIS_MODULE, | 1905 | .owner = THIS_MODULE, |
1906 | .open = saa_open, | 1906 | .open = saa_open, |
1907 | .release = saa_release, | 1907 | .release = saa_release, |
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index a1ec3aca3f91..bf3aa8d2d57e 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
@@ -1380,7 +1380,7 @@ static ssize_t stv680_read (struct file *file, char __user *buf, | |||
1380 | return realcount; | 1380 | return realcount; |
1381 | } /* stv680_read */ | 1381 | } /* stv680_read */ |
1382 | 1382 | ||
1383 | static struct file_operations stv680_fops = { | 1383 | static const struct file_operations stv680_fops = { |
1384 | .owner = THIS_MODULE, | 1384 | .owner = THIS_MODULE, |
1385 | .open = stv_open, | 1385 | .open = stv_open, |
1386 | .release = stv_close, | 1386 | .release = stv_close, |
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c index 1654576de10e..e2747bd373fd 100644 --- a/drivers/media/video/tvmixer.c +++ b/drivers/media/video/tvmixer.c | |||
@@ -228,7 +228,7 @@ static struct i2c_driver driver = { | |||
228 | .detach_client = tvmixer_clients, | 228 | .detach_client = tvmixer_clients, |
229 | }; | 229 | }; |
230 | 230 | ||
231 | static struct file_operations tvmixer_fops = { | 231 | static const struct file_operations tvmixer_fops = { |
232 | .owner = THIS_MODULE, | 232 | .owner = THIS_MODULE, |
233 | .llseek = no_llseek, | 233 | .llseek = no_llseek, |
234 | .ioctl = tvmixer_ioctl, | 234 | .ioctl = tvmixer_ioctl, |
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index b560c9d7c516..d34d8c8b7376 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -945,7 +945,7 @@ static int usbvideo_find_struct(struct usbvideo *cams) | |||
945 | return rv; | 945 | return rv; |
946 | } | 946 | } |
947 | 947 | ||
948 | static struct file_operations usbvideo_fops = { | 948 | static const struct file_operations usbvideo_fops = { |
949 | .owner = THIS_MODULE, | 949 | .owner = THIS_MODULE, |
950 | .open = usbvideo_v4l_open, | 950 | .open = usbvideo_v4l_open, |
951 | .release =usbvideo_v4l_close, | 951 | .release =usbvideo_v4l_close, |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 08f9559a6bfa..876fd2768242 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -1234,7 +1234,7 @@ static inline void vicam_create_proc_entry(struct vicam_camera *cam) { } | |||
1234 | static inline void vicam_destroy_proc_entry(void *ptr) { } | 1234 | static inline void vicam_destroy_proc_entry(void *ptr) { } |
1235 | #endif | 1235 | #endif |
1236 | 1236 | ||
1237 | static struct file_operations vicam_fops = { | 1237 | static const struct file_operations vicam_fops = { |
1238 | .owner = THIS_MODULE, | 1238 | .owner = THIS_MODULE, |
1239 | .open = vicam_open, | 1239 | .open = vicam_open, |
1240 | .release = vicam_close, | 1240 | .release = vicam_close, |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index bdd6301d2a47..4eb7330b96f8 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -1475,7 +1475,7 @@ static int usbvision_vbi_ioctl(struct inode *inode, struct file *file, | |||
1475 | // | 1475 | // |
1476 | 1476 | ||
1477 | // Video template | 1477 | // Video template |
1478 | static struct file_operations usbvision_fops = { | 1478 | static const struct file_operations usbvision_fops = { |
1479 | .owner = THIS_MODULE, | 1479 | .owner = THIS_MODULE, |
1480 | .open = usbvision_v4l2_open, | 1480 | .open = usbvision_v4l2_open, |
1481 | .release = usbvision_v4l2_close, | 1481 | .release = usbvision_v4l2_close, |
@@ -1496,7 +1496,7 @@ static struct video_device usbvision_video_template = { | |||
1496 | 1496 | ||
1497 | 1497 | ||
1498 | // Radio template | 1498 | // Radio template |
1499 | static struct file_operations usbvision_radio_fops = { | 1499 | static const struct file_operations usbvision_radio_fops = { |
1500 | .owner = THIS_MODULE, | 1500 | .owner = THIS_MODULE, |
1501 | .open = usbvision_radio_open, | 1501 | .open = usbvision_radio_open, |
1502 | .release = usbvision_radio_close, | 1502 | .release = usbvision_radio_close, |
@@ -1517,7 +1517,7 @@ static struct video_device usbvision_radio_template= | |||
1517 | 1517 | ||
1518 | 1518 | ||
1519 | // vbi template | 1519 | // vbi template |
1520 | static struct file_operations usbvision_vbi_fops = { | 1520 | static const struct file_operations usbvision_vbi_fops = { |
1521 | .owner = THIS_MODULE, | 1521 | .owner = THIS_MODULE, |
1522 | .open = usbvision_vbi_open, | 1522 | .open = usbvision_vbi_open, |
1523 | .release = usbvision_vbi_close, | 1523 | .release = usbvision_vbi_close, |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 6a0e8ca72948..30c3822692fb 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -1561,7 +1561,7 @@ out: | |||
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | 1563 | ||
1564 | static struct file_operations video_fops; | 1564 | static const struct file_operations video_fops; |
1565 | 1565 | ||
1566 | /** | 1566 | /** |
1567 | * video_register_device - register video4linux devices | 1567 | * video_register_device - register video4linux devices |
@@ -1709,7 +1709,7 @@ void video_unregister_device(struct video_device *vfd) | |||
1709 | /* | 1709 | /* |
1710 | * Video fs operations | 1710 | * Video fs operations |
1711 | */ | 1711 | */ |
1712 | static struct file_operations video_fops= | 1712 | static const struct file_operations video_fops= |
1713 | { | 1713 | { |
1714 | .owner = THIS_MODULE, | 1714 | .owner = THIS_MODULE, |
1715 | .llseek = no_llseek, | 1715 | .llseek = no_llseek, |
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index a373c142e742..0c658b74f2c4 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -4390,7 +4390,7 @@ static int vino_ioctl(struct inode *inode, struct file *file, | |||
4390 | // __initdata | 4390 | // __initdata |
4391 | static int vino_init_stage = 0; | 4391 | static int vino_init_stage = 0; |
4392 | 4392 | ||
4393 | static struct file_operations vino_fops = { | 4393 | static const struct file_operations vino_fops = { |
4394 | .owner = THIS_MODULE, | 4394 | .owner = THIS_MODULE, |
4395 | .open = vino_open, | 4395 | .open = vino_open, |
4396 | .release = vino_close, | 4396 | .release = vino_close, |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index d4cf55666731..cfb6b1f0402c 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1292,7 +1292,7 @@ vivi_mmap(struct file *file, struct vm_area_struct * vma) | |||
1292 | return ret; | 1292 | return ret; |
1293 | } | 1293 | } |
1294 | 1294 | ||
1295 | static struct file_operations vivi_fops = { | 1295 | static const struct file_operations vivi_fops = { |
1296 | .owner = THIS_MODULE, | 1296 | .owner = THIS_MODULE, |
1297 | .open = vivi_open, | 1297 | .open = vivi_open, |
1298 | .release = vivi_release, | 1298 | .release = vivi_release, |
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 8d14f308f171..47366408637c 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -183,7 +183,7 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file, | |||
183 | static ssize_t w9966_v4l_read(struct file *file, char __user *buf, | 183 | static ssize_t w9966_v4l_read(struct file *file, char __user *buf, |
184 | size_t count, loff_t *ppos); | 184 | size_t count, loff_t *ppos); |
185 | 185 | ||
186 | static struct file_operations w9966_fops = { | 186 | static const struct file_operations w9966_fops = { |
187 | .owner = THIS_MODULE, | 187 | .owner = THIS_MODULE, |
188 | .open = video_exclusive_open, | 188 | .open = video_exclusive_open, |
189 | .release = video_exclusive_release, | 189 | .release = video_exclusive_release, |
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 9f403af7b040..6e64af293be5 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -399,7 +399,7 @@ MODULE_PARM_DESC(specific_debug, | |||
399 | ****************************************************************************/ | 399 | ****************************************************************************/ |
400 | 400 | ||
401 | /* Video4linux interface */ | 401 | /* Video4linux interface */ |
402 | static struct file_operations w9968cf_fops; | 402 | static const struct file_operations w9968cf_fops; |
403 | static int w9968cf_open(struct inode*, struct file*); | 403 | static int w9968cf_open(struct inode*, struct file*); |
404 | static int w9968cf_release(struct inode*, struct file*); | 404 | static int w9968cf_release(struct inode*, struct file*); |
405 | static int w9968cf_mmap(struct file*, struct vm_area_struct*); | 405 | static int w9968cf_mmap(struct file*, struct vm_area_struct*); |
@@ -3466,7 +3466,7 @@ ioctl_fail: | |||
3466 | } | 3466 | } |
3467 | 3467 | ||
3468 | 3468 | ||
3469 | static struct file_operations w9968cf_fops = { | 3469 | static const struct file_operations w9968cf_fops = { |
3470 | .owner = THIS_MODULE, | 3470 | .owner = THIS_MODULE, |
3471 | .open = w9968cf_open, | 3471 | .open = w9968cf_open, |
3472 | .release = w9968cf_release, | 3472 | .release = w9968cf_release, |
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c index 52d0f759ee00..8da7f15f6290 100644 --- a/drivers/media/video/zc0301/zc0301_core.c +++ b/drivers/media/video/zc0301/zc0301_core.c | |||
@@ -1871,7 +1871,7 @@ static int zc0301_ioctl(struct inode* inode, struct file* filp, | |||
1871 | } | 1871 | } |
1872 | 1872 | ||
1873 | 1873 | ||
1874 | static struct file_operations zc0301_fops = { | 1874 | static const struct file_operations zc0301_fops = { |
1875 | .owner = THIS_MODULE, | 1875 | .owner = THIS_MODULE, |
1876 | .open = zc0301_open, | 1876 | .open = zc0301_open, |
1877 | .release = zc0301_release, | 1877 | .release = zc0301_release, |
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index e10a9ee25fc5..074323733352 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -4679,7 +4679,7 @@ zoran_mmap (struct file *file, | |||
4679 | return 0; | 4679 | return 0; |
4680 | } | 4680 | } |
4681 | 4681 | ||
4682 | static struct file_operations zoran_fops = { | 4682 | static const struct file_operations zoran_fops = { |
4683 | .owner = THIS_MODULE, | 4683 | .owner = THIS_MODULE, |
4684 | .open = zoran_open, | 4684 | .open = zoran_open, |
4685 | .release = zoran_close, | 4685 | .release = zoran_close, |
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c index c374c76b3753..446ae8d5c3df 100644 --- a/drivers/media/video/zoran_procfs.c +++ b/drivers/media/video/zoran_procfs.c | |||
@@ -186,7 +186,7 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer, | |||
186 | return count; | 186 | return count; |
187 | } | 187 | } |
188 | 188 | ||
189 | static struct file_operations zoran_operations = { | 189 | static const struct file_operations zoran_operations = { |
190 | .open = zoran_open, | 190 | .open = zoran_open, |
191 | .read = seq_read, | 191 | .read = seq_read, |
192 | .write = zoran_write, | 192 | .write = zoran_write, |