diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-27 14:29:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 14:39:25 -0400 |
commit | f0f37e2f77731b3473fa6bd5ee53255d9a9cdb40 (patch) | |
tree | 3c26d3ed1a453156e9c208ccb5567a8954dba064 /drivers/media | |
parent | 6f5071020d5ec89b5d095aa488db604adb921aec (diff) |
const: mark struct vm_struct_operations
* mark struct vm_area_struct::vm_ops as const
* mark vm_ops in AGP code
But leave TTM code alone, something is fishy there with global vm_ops
being used.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 2 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 2 | ||||
-rw-r--r-- | drivers/media/video/meye.c | 2 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/stk-webcam.c | 2 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_v4l2.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-vmalloc.c | 2 | ||||
-rw-r--r-- | drivers/media/video/vino.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zc0301/zc0301_core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zoran_driver.c | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 657c481d255c..10230cb3d210 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1325,7 +1325,7 @@ static void cafe_v4l_vm_close(struct vm_area_struct *vma) | |||
1325 | mutex_unlock(&sbuf->cam->s_mutex); | 1325 | mutex_unlock(&sbuf->cam->s_mutex); |
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | static struct vm_operations_struct cafe_v4l_vm_ops = { | 1328 | static const struct vm_operations_struct cafe_v4l_vm_ops = { |
1329 | .open = cafe_v4l_vm_open, | 1329 | .open = cafe_v4l_vm_open, |
1330 | .close = cafe_v4l_vm_close | 1330 | .close = cafe_v4l_vm_close |
1331 | }; | 1331 | }; |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 74092f436be6..88987a57cf7b 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
@@ -1496,7 +1496,7 @@ static void et61x251_vm_close(struct vm_area_struct* vma) | |||
1496 | } | 1496 | } |
1497 | 1497 | ||
1498 | 1498 | ||
1499 | static struct vm_operations_struct et61x251_vm_ops = { | 1499 | static const struct vm_operations_struct et61x251_vm_ops = { |
1500 | .open = et61x251_vm_open, | 1500 | .open = et61x251_vm_open, |
1501 | .close = et61x251_vm_close, | 1501 | .close = et61x251_vm_close, |
1502 | }; | 1502 | }; |
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index cf6540da1e42..23d3fb776918 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -99,7 +99,7 @@ static void gspca_vm_close(struct vm_area_struct *vma) | |||
99 | frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED; | 99 | frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED; |
100 | } | 100 | } |
101 | 101 | ||
102 | static struct vm_operations_struct gspca_vm_ops = { | 102 | static const struct vm_operations_struct gspca_vm_ops = { |
103 | .open = gspca_vm_open, | 103 | .open = gspca_vm_open, |
104 | .close = gspca_vm_close, | 104 | .close = gspca_vm_close, |
105 | }; | 105 | }; |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index d0765bed79c9..4b1bc05a462c 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1589,7 +1589,7 @@ static void meye_vm_close(struct vm_area_struct *vma) | |||
1589 | meye.vma_use_count[idx]--; | 1589 | meye.vma_use_count[idx]--; |
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | static struct vm_operations_struct meye_vm_ops = { | 1592 | static const struct vm_operations_struct meye_vm_ops = { |
1593 | .open = meye_vm_open, | 1593 | .open = meye_vm_open, |
1594 | .close = meye_vm_close, | 1594 | .close = meye_vm_close, |
1595 | }; | 1595 | }; |
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 9d84c94e8a40..4a7711c3e745 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -2077,7 +2077,7 @@ static void sn9c102_vm_close(struct vm_area_struct* vma) | |||
2077 | } | 2077 | } |
2078 | 2078 | ||
2079 | 2079 | ||
2080 | static struct vm_operations_struct sn9c102_vm_ops = { | 2080 | static const struct vm_operations_struct sn9c102_vm_ops = { |
2081 | .open = sn9c102_vm_open, | 2081 | .open = sn9c102_vm_open, |
2082 | .close = sn9c102_vm_close, | 2082 | .close = sn9c102_vm_close, |
2083 | }; | 2083 | }; |
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index 0b996ea4134e..6b41865f42bd 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -790,7 +790,7 @@ static void stk_v4l_vm_close(struct vm_area_struct *vma) | |||
790 | if (sbuf->mapcount == 0) | 790 | if (sbuf->mapcount == 0) |
791 | sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED; | 791 | sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED; |
792 | } | 792 | } |
793 | static struct vm_operations_struct stk_v4l_vm_ops = { | 793 | static const struct vm_operations_struct stk_v4l_vm_ops = { |
794 | .open = stk_v4l_vm_open, | 794 | .open = stk_v4l_vm_open, |
795 | .close = stk_v4l_vm_close | 795 | .close = stk_v4l_vm_close |
796 | }; | 796 | }; |
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 9e7351569b5d..a2bdd806efab 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
@@ -1069,7 +1069,7 @@ static void uvc_vm_close(struct vm_area_struct *vma) | |||
1069 | buffer->vma_use_count--; | 1069 | buffer->vma_use_count--; |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | static struct vm_operations_struct uvc_vm_ops = { | 1072 | static const struct vm_operations_struct uvc_vm_ops = { |
1073 | .open = uvc_vm_open, | 1073 | .open = uvc_vm_open, |
1074 | .close = uvc_vm_close, | 1074 | .close = uvc_vm_close, |
1075 | }; | 1075 | }; |
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index d09ce83a9429..635ffc7b0391 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -105,7 +105,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | static struct vm_operations_struct videobuf_vm_ops = { | 108 | static const struct vm_operations_struct videobuf_vm_ops = { |
109 | .open = videobuf_vm_open, | 109 | .open = videobuf_vm_open, |
110 | .close = videobuf_vm_close, | 110 | .close = videobuf_vm_close, |
111 | }; | 111 | }; |
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index a8dd22ace3fb..53cdd67cebe1 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -394,7 +394,7 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
394 | return 0; | 394 | return 0; |
395 | } | 395 | } |
396 | 396 | ||
397 | static struct vm_operations_struct videobuf_vm_ops = | 397 | static const struct vm_operations_struct videobuf_vm_ops = |
398 | { | 398 | { |
399 | .open = videobuf_vm_open, | 399 | .open = videobuf_vm_open, |
400 | .close = videobuf_vm_close, | 400 | .close = videobuf_vm_close, |
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c index 30ae30f99ccc..35f3900c5633 100644 --- a/drivers/media/video/videobuf-vmalloc.c +++ b/drivers/media/video/videobuf-vmalloc.c | |||
@@ -116,7 +116,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma) | |||
116 | return; | 116 | return; |
117 | } | 117 | } |
118 | 118 | ||
119 | static struct vm_operations_struct videobuf_vm_ops = | 119 | static const struct vm_operations_struct videobuf_vm_ops = |
120 | { | 120 | { |
121 | .open = videobuf_vm_open, | 121 | .open = videobuf_vm_open, |
122 | .close = videobuf_vm_close, | 122 | .close = videobuf_vm_close, |
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index cd6a3446ab7e..b034a81d2b1c 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -3857,7 +3857,7 @@ static void vino_vm_close(struct vm_area_struct *vma) | |||
3857 | dprintk("vino_vm_close(): count = %d\n", fb->map_count); | 3857 | dprintk("vino_vm_close(): count = %d\n", fb->map_count); |
3858 | } | 3858 | } |
3859 | 3859 | ||
3860 | static struct vm_operations_struct vino_vm_ops = { | 3860 | static const struct vm_operations_struct vino_vm_ops = { |
3861 | .open = vino_vm_open, | 3861 | .open = vino_vm_open, |
3862 | .close = vino_vm_close, | 3862 | .close = vino_vm_close, |
3863 | }; | 3863 | }; |
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c index b3c6436b33ba..312a71336fd0 100644 --- a/drivers/media/video/zc0301/zc0301_core.c +++ b/drivers/media/video/zc0301/zc0301_core.c | |||
@@ -935,7 +935,7 @@ static void zc0301_vm_close(struct vm_area_struct* vma) | |||
935 | } | 935 | } |
936 | 936 | ||
937 | 937 | ||
938 | static struct vm_operations_struct zc0301_vm_ops = { | 938 | static const struct vm_operations_struct zc0301_vm_ops = { |
939 | .open = zc0301_vm_open, | 939 | .open = zc0301_vm_open, |
940 | .close = zc0301_vm_close, | 940 | .close = zc0301_vm_close, |
941 | }; | 941 | }; |
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index bcdefb1bcb3d..47137deafcfd 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
@@ -3172,7 +3172,7 @@ zoran_vm_close (struct vm_area_struct *vma) | |||
3172 | mutex_unlock(&zr->resource_lock); | 3172 | mutex_unlock(&zr->resource_lock); |
3173 | } | 3173 | } |
3174 | 3174 | ||
3175 | static struct vm_operations_struct zoran_vm_ops = { | 3175 | static const struct vm_operations_struct zoran_vm_ops = { |
3176 | .open = zoran_vm_open, | 3176 | .open = zoran_vm_open, |
3177 | .close = zoran_vm_close, | 3177 | .close = zoran_vm_close, |
3178 | }; | 3178 | }; |