diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-29 05:49:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:07 -0500 |
commit | cc611b8aef7a8a9a2e614f1bdf3e2b8f066c8c8d (patch) | |
tree | 1d05177ca24588bbeba596f44704af4bf109b16b | |
parent | 4c98834addfee3fdd42c505c37569261bf669d94 (diff) |
V4L/DVB (10049): gspca - many subdrivers: Set 'const' the pixel format table.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
23 files changed, 33 insertions, 33 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index de28354ea5ba..1753f5bb3544 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
@@ -93,7 +93,7 @@ static struct ctrl sd_ctrls[] = { | |||
93 | }, | 93 | }, |
94 | }; | 94 | }; |
95 | 95 | ||
96 | static struct v4l2_pix_format vga_mode[] = { | 96 | static const struct v4l2_pix_format vga_mode[] = { |
97 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 97 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
98 | .bytesperline = 176, | 98 | .bytesperline = 176, |
99 | .sizeimage = 176 * 144 * 3 / 8 + 590, | 99 | .sizeimage = 176 * 144 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c index 3be30b420a26..f3cd8ff5cc92 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/video/gspca/etoms.c | |||
@@ -112,7 +112,7 @@ static struct ctrl sd_ctrls[] = { | |||
112 | }, | 112 | }, |
113 | }; | 113 | }; |
114 | 114 | ||
115 | static struct v4l2_pix_format vga_mode[] = { | 115 | static const struct v4l2_pix_format vga_mode[] = { |
116 | {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | 116 | {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
117 | .bytesperline = 320, | 117 | .bytesperline = 320, |
118 | .sizeimage = 320 * 240, | 118 | .sizeimage = 320 * 240, |
@@ -125,7 +125,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
125 | .priv = 0}, */ | 125 | .priv = 0}, */ |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static struct v4l2_pix_format sif_mode[] = { | 128 | static const struct v4l2_pix_format sif_mode[] = { |
129 | {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | 129 | {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
130 | .bytesperline = 176, | 130 | .bytesperline = 176, |
131 | .sizeimage = 176 * 144, | 131 | .sizeimage = 176 * 144, |
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c index 03cb94466323..afc8b2dd307b 100644 --- a/drivers/media/video/gspca/finepix.c +++ b/drivers/media/video/gspca/finepix.c | |||
@@ -72,7 +72,7 @@ struct usb_fpix { | |||
72 | } | 72 | } |
73 | 73 | ||
74 | /* These cameras only support 320x200. */ | 74 | /* These cameras only support 320x200. */ |
75 | static struct v4l2_pix_format fpix_mode[1] = { | 75 | static const struct v4l2_pix_format fpix_mode[1] = { |
76 | { 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 76 | { 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
77 | .bytesperline = 320, | 77 | .bytesperline = 320, |
78 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 78 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 79cef31a5e33..c90af9cb1e07 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
@@ -56,7 +56,7 @@ extern int gspca_debug; | |||
56 | /* device information - set at probe time */ | 56 | /* device information - set at probe time */ |
57 | struct cam { | 57 | struct cam { |
58 | int bulk_size; /* buffer size when image transfer by bulk */ | 58 | int bulk_size; /* buffer size when image transfer by bulk */ |
59 | struct v4l2_pix_format *cam_mode; /* size nmodes */ | 59 | const struct v4l2_pix_format *cam_mode; /* size nmodes */ |
60 | char nmodes; | 60 | char nmodes; |
61 | __u8 bulk_nurbs; /* number of URBs in bulk mode | 61 | __u8 bulk_nurbs; /* number of URBs in bulk mode |
62 | * - cannot be > MAX_NURBS | 62 | * - cannot be > MAX_NURBS |
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index 492cdd3b5c84..3d2090e67a63 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
@@ -39,7 +39,7 @@ struct sd { | |||
39 | static struct ctrl sd_ctrls[] = { | 39 | static struct ctrl sd_ctrls[] = { |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static struct v4l2_pix_format vga_mode[] = { | 42 | static const struct v4l2_pix_format vga_mode[] = { |
43 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 43 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
44 | .bytesperline = 320, | 44 | .bytesperline = 320, |
45 | .sizeimage = 320 * 240 * 3 / 8 + 589, | 45 | .sizeimage = 320 * 240 * 3 / 8 + 589, |
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index a366b3449e8b..ee232956c812 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -164,7 +164,7 @@ static struct ctrl sd_ctrls[] = { | |||
164 | }, | 164 | }, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static struct v4l2_pix_format vga_mode[] = { | 167 | static const struct v4l2_pix_format vga_mode[] = { |
168 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 168 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
169 | .bytesperline = 320, | 169 | .bytesperline = 320, |
170 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 170 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -176,7 +176,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
176 | .colorspace = V4L2_COLORSPACE_JPEG, | 176 | .colorspace = V4L2_COLORSPACE_JPEG, |
177 | .priv = 0}, | 177 | .priv = 0}, |
178 | }; | 178 | }; |
179 | static struct v4l2_pix_format sif_mode[] = { | 179 | static const struct v4l2_pix_format sif_mode[] = { |
180 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 180 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
181 | .bytesperline = 176, | 181 | .bytesperline = 176, |
182 | .sizeimage = 176 * 144 * 3 / 8 + 590, | 182 | .sizeimage = 176 * 144 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 406f6bc12d9f..3bf15e401693 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/video/gspca/ov534.c | |||
@@ -55,7 +55,7 @@ struct sd { | |||
55 | static struct ctrl sd_ctrls[] = { | 55 | static struct ctrl sd_ctrls[] = { |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static struct v4l2_pix_format vga_mode[] = { | 58 | static const struct v4l2_pix_format vga_mode[] = { |
59 | {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE, | 59 | {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE, |
60 | .bytesperline = 640 * 2, | 60 | .bytesperline = 640 * 2, |
61 | .sizeimage = 640 * 480 * 2, | 61 | .sizeimage = 640 * 480 * 2, |
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c index e46b8e8f0a7e..c90ac852bac0 100644 --- a/drivers/media/video/gspca/pac207.c +++ b/drivers/media/video/gspca/pac207.c | |||
@@ -149,7 +149,7 @@ static struct ctrl sd_ctrls[] = { | |||
149 | }, | 149 | }, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static struct v4l2_pix_format sif_mode[] = { | 152 | static const struct v4l2_pix_format sif_mode[] = { |
153 | {176, 144, V4L2_PIX_FMT_PAC207, V4L2_FIELD_NONE, | 153 | {176, 144, V4L2_PIX_FMT_PAC207, V4L2_FIELD_NONE, |
154 | .bytesperline = 176, | 154 | .bytesperline = 176, |
155 | .sizeimage = (176 + 2) * 144, | 155 | .sizeimage = (176 + 2) * 144, |
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c index 1b72e15cb3ae..a9c95cba710e 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/video/gspca/pac7311.c | |||
@@ -226,7 +226,7 @@ static struct ctrl sd_ctrls[] = { | |||
226 | }, | 226 | }, |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static struct v4l2_pix_format vga_mode[] = { | 229 | static const struct v4l2_pix_format vga_mode[] = { |
230 | {160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE, | 230 | {160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE, |
231 | .bytesperline = 160, | 231 | .bytesperline = 160, |
232 | .sizeimage = 160 * 120 * 3 / 8 + 590, | 232 | .sizeimage = 160 * 120 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index ffa714fde85c..b3e4e0677b68 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
@@ -227,7 +227,7 @@ static struct ctrl sd_ctrls[] = { | |||
227 | }, | 227 | }, |
228 | }; | 228 | }; |
229 | 229 | ||
230 | static struct v4l2_pix_format vga_mode[] = { | 230 | static const struct v4l2_pix_format vga_mode[] = { |
231 | {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | 231 | {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
232 | .bytesperline = 160, | 232 | .bytesperline = 160, |
233 | .sizeimage = 160 * 120, | 233 | .sizeimage = 160 * 120, |
@@ -249,7 +249,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
249 | .colorspace = V4L2_COLORSPACE_SRGB, | 249 | .colorspace = V4L2_COLORSPACE_SRGB, |
250 | .priv = 0}, | 250 | .priv = 0}, |
251 | }; | 251 | }; |
252 | static struct v4l2_pix_format sif_mode[] = { | 252 | static const struct v4l2_pix_format sif_mode[] = { |
253 | {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | 253 | {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
254 | .bytesperline = 160, | 254 | .bytesperline = 160, |
255 | .sizeimage = 160 * 120, | 255 | .sizeimage = 160 * 120, |
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 57232ba96b4a..3373b8d9d2a8 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -225,7 +225,7 @@ static __u32 ctrl_dis[] = { | |||
225 | /* SENSOR_OV7660 6 */ | 225 | /* SENSOR_OV7660 6 */ |
226 | }; | 226 | }; |
227 | 227 | ||
228 | static struct v4l2_pix_format vga_mode[] = { | 228 | static const struct v4l2_pix_format vga_mode[] = { |
229 | {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 229 | {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
230 | .bytesperline = 160, | 230 | .bytesperline = 160, |
231 | .sizeimage = 160 * 120 * 4 / 8 + 590, | 231 | .sizeimage = 160 * 120 * 4 / 8 + 590, |
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c index 09ff69791da7..942f04cd44dd 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/video/gspca/spca500.c | |||
@@ -111,7 +111,7 @@ static struct ctrl sd_ctrls[] = { | |||
111 | }, | 111 | }, |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static struct v4l2_pix_format vga_mode[] = { | 114 | static const struct v4l2_pix_format vga_mode[] = { |
115 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 115 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
116 | .bytesperline = 320, | 116 | .bytesperline = 320, |
117 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 117 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -124,7 +124,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
124 | .priv = 0}, | 124 | .priv = 0}, |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static struct v4l2_pix_format sif_mode[] = { | 127 | static const struct v4l2_pix_format sif_mode[] = { |
128 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 128 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
129 | .bytesperline = 176, | 129 | .bytesperline = 176, |
130 | .sizeimage = 176 * 144 * 3 / 8 + 590, | 130 | .sizeimage = 176 * 144 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c index 9318de9aaf85..82e3e3e2ada1 100644 --- a/drivers/media/video/gspca/spca501.c +++ b/drivers/media/video/gspca/spca501.c | |||
@@ -132,7 +132,7 @@ static struct ctrl sd_ctrls[] = { | |||
132 | }, | 132 | }, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static struct v4l2_pix_format vga_mode[] = { | 135 | static const struct v4l2_pix_format vga_mode[] = { |
136 | {160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE, | 136 | {160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE, |
137 | .bytesperline = 160, | 137 | .bytesperline = 160, |
138 | .sizeimage = 160 * 120 * 3 / 2, | 138 | .sizeimage = 160 * 120 * 3 / 2, |
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index 895b9fe4018c..2a33a29010ee 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c | |||
@@ -59,7 +59,7 @@ static struct ctrl sd_ctrls[] = { | |||
59 | }, | 59 | }, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | static struct v4l2_pix_format vga_mode[] = { | 62 | static const struct v4l2_pix_format vga_mode[] = { |
63 | {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE, | 63 | {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE, |
64 | .bytesperline = 160, | 64 | .bytesperline = 160, |
65 | .sizeimage = 160 * 120 * 3 / 2, | 65 | .sizeimage = 160 * 120 * 3 / 2, |
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c index 645ee9d44d02..96e2512e0621 100644 --- a/drivers/media/video/gspca/spca506.c +++ b/drivers/media/video/gspca/spca506.c | |||
@@ -110,7 +110,7 @@ static struct ctrl sd_ctrls[] = { | |||
110 | }, | 110 | }, |
111 | }; | 111 | }; |
112 | 112 | ||
113 | static struct v4l2_pix_format vga_mode[] = { | 113 | static const struct v4l2_pix_format vga_mode[] = { |
114 | {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE, | 114 | {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE, |
115 | .bytesperline = 160, | 115 | .bytesperline = 160, |
116 | .sizeimage = 160 * 120 * 3 / 2, | 116 | .sizeimage = 160 * 120 * 3 / 2, |
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c index 63ec902c895d..be5d740a315d 100644 --- a/drivers/media/video/gspca/spca508.c +++ b/drivers/media/video/gspca/spca508.c | |||
@@ -62,7 +62,7 @@ static struct ctrl sd_ctrls[] = { | |||
62 | }, | 62 | }, |
63 | }; | 63 | }; |
64 | 64 | ||
65 | static struct v4l2_pix_format sif_mode[] = { | 65 | static const struct v4l2_pix_format sif_mode[] = { |
66 | {160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE, | 66 | {160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE, |
67 | .bytesperline = 160, | 67 | .bytesperline = 160, |
68 | .sizeimage = 160 * 120 * 3 / 2, | 68 | .sizeimage = 160 * 120 * 3 / 2, |
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index 0f7df3b3fba1..3c9288019e96 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
@@ -73,7 +73,7 @@ struct sd { | |||
73 | #define AG_CNT_START 13 | 73 | #define AG_CNT_START 13 |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static struct v4l2_pix_format sif_012a_mode[] = { | 76 | static const struct v4l2_pix_format sif_012a_mode[] = { |
77 | {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, | 77 | {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, |
78 | .bytesperline = 160, | 78 | .bytesperline = 160, |
79 | .sizeimage = 160 * 120, | 79 | .sizeimage = 160 * 120, |
@@ -96,7 +96,7 @@ static struct v4l2_pix_format sif_012a_mode[] = { | |||
96 | .priv = 0}, | 96 | .priv = 0}, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static struct v4l2_pix_format sif_072a_mode[] = { | 99 | static const struct v4l2_pix_format sif_072a_mode[] = { |
100 | {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, | 100 | {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, |
101 | .bytesperline = 160, | 101 | .bytesperline = 160, |
102 | .sizeimage = 160 * 120, | 102 | .sizeimage = 160 * 120, |
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c index 74f57db534c9..60de9af87fbb 100644 --- a/drivers/media/video/gspca/stk014.c +++ b/drivers/media/video/gspca/stk014.c | |||
@@ -109,7 +109,7 @@ static struct ctrl sd_ctrls[] = { | |||
109 | }, | 109 | }, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static struct v4l2_pix_format vga_mode[] = { | 112 | static const struct v4l2_pix_format vga_mode[] = { |
113 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 113 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
114 | .bytesperline = 320, | 114 | .bytesperline = 320, |
115 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 115 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index bd9288665a80..6d904d5e4c74 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
@@ -123,7 +123,7 @@ static struct ctrl sd_ctrls[] = { | |||
123 | }, | 123 | }, |
124 | }; | 124 | }; |
125 | 125 | ||
126 | static struct v4l2_pix_format vga_mode[] = { | 126 | static const struct v4l2_pix_format vga_mode[] = { |
127 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 127 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
128 | .bytesperline = 320, | 128 | .bytesperline = 320, |
129 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 129 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -136,7 +136,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
136 | .priv = 1}, | 136 | .priv = 1}, |
137 | }; | 137 | }; |
138 | 138 | ||
139 | static struct v4l2_pix_format custom_mode[] = { | 139 | static const struct v4l2_pix_format custom_mode[] = { |
140 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 140 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
141 | .bytesperline = 320, | 141 | .bytesperline = 320, |
142 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 142 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -149,7 +149,7 @@ static struct v4l2_pix_format custom_mode[] = { | |||
149 | .priv = 1}, | 149 | .priv = 1}, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static struct v4l2_pix_format vga_mode2[] = { | 152 | static const struct v4l2_pix_format vga_mode2[] = { |
153 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 153 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
154 | .bytesperline = 176, | 154 | .bytesperline = 176, |
155 | .sizeimage = 176 * 144 * 3 / 8 + 590, | 155 | .sizeimage = 176 * 144 * 3 / 8 + 590, |
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c index 42126b549971..6ee111a3cbd1 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/video/gspca/t613.c | |||
@@ -233,7 +233,7 @@ static char *effects_control[] = { | |||
233 | "Negative", | 233 | "Negative", |
234 | }; | 234 | }; |
235 | 235 | ||
236 | static struct v4l2_pix_format vga_mode_t16[] = { | 236 | static const struct v4l2_pix_format vga_mode_t16[] = { |
237 | {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 237 | {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
238 | .bytesperline = 160, | 238 | .bytesperline = 160, |
239 | .sizeimage = 160 * 120 * 4 / 8 + 590, | 239 | .sizeimage = 160 * 120 * 4 / 8 + 590, |
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c index 3eac1cb88520..94163cceb28a 100644 --- a/drivers/media/video/gspca/tv8532.c +++ b/drivers/media/video/gspca/tv8532.c | |||
@@ -73,7 +73,7 @@ static struct ctrl sd_ctrls[] = { | |||
73 | }, | 73 | }, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static struct v4l2_pix_format sif_mode[] = { | 76 | static const struct v4l2_pix_format sif_mode[] = { |
77 | {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | 77 | {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
78 | .bytesperline = 176, | 78 | .bytesperline = 176, |
79 | .sizeimage = 176 * 144, | 79 | .sizeimage = 176 * 144, |
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c index 1793da4f5850..71335dad433a 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/video/gspca/vc032x.c | |||
@@ -126,7 +126,7 @@ static struct ctrl sd_ctrls[] = { | |||
126 | }, | 126 | }, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static struct v4l2_pix_format vc0321_mode[] = { | 129 | static const struct v4l2_pix_format vc0321_mode[] = { |
130 | {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE, | 130 | {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE, |
131 | .bytesperline = 320, | 131 | .bytesperline = 320, |
132 | .sizeimage = 320 * 240 * 2, | 132 | .sizeimage = 320 * 240 * 2, |
@@ -138,7 +138,7 @@ static struct v4l2_pix_format vc0321_mode[] = { | |||
138 | .colorspace = V4L2_COLORSPACE_SRGB, | 138 | .colorspace = V4L2_COLORSPACE_SRGB, |
139 | .priv = 0}, | 139 | .priv = 0}, |
140 | }; | 140 | }; |
141 | static struct v4l2_pix_format vc0323_mode[] = { | 141 | static const struct v4l2_pix_format vc0323_mode[] = { |
142 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 142 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
143 | .bytesperline = 320, | 143 | .bytesperline = 320, |
144 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 144 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -151,7 +151,7 @@ static struct v4l2_pix_format vc0323_mode[] = { | |||
151 | .priv = 0}, | 151 | .priv = 0}, |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static struct v4l2_pix_format svga_mode[] = { | 154 | static const struct v4l2_pix_format svga_mode[] = { |
155 | {800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 155 | {800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
156 | .bytesperline = 800, | 156 | .bytesperline = 800, |
157 | .sizeimage = 800 * 600 * 1 / 4 + 590, | 157 | .sizeimage = 800 * 600 * 1 / 4 + 590, |
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 8ded9e6e8a7a..ec2a53d53fe2 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -173,7 +173,7 @@ static struct ctrl sd_ctrls[] = { | |||
173 | }, | 173 | }, |
174 | }; | 174 | }; |
175 | 175 | ||
176 | static struct v4l2_pix_format vga_mode[] = { | 176 | static const struct v4l2_pix_format vga_mode[] = { |
177 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 177 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
178 | .bytesperline = 320, | 178 | .bytesperline = 320, |
179 | .sizeimage = 320 * 240 * 3 / 8 + 590, | 179 | .sizeimage = 320 * 240 * 3 / 8 + 590, |
@@ -186,7 +186,7 @@ static struct v4l2_pix_format vga_mode[] = { | |||
186 | .priv = 0}, | 186 | .priv = 0}, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static struct v4l2_pix_format sif_mode[] = { | 189 | static const struct v4l2_pix_format sif_mode[] = { |
190 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | 190 | {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
191 | .bytesperline = 176, | 191 | .bytesperline = 176, |
192 | .sizeimage = 176 * 144 * 3 / 8 + 590, | 192 | .sizeimage = 176 * 144 * 3 / 8 + 590, |