diff options
Diffstat (limited to 'drivers/media/video/tcm825x.c')
| -rw-r--r-- | drivers/media/video/tcm825x.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c index 29991d1cf13e..b30c49248217 100644 --- a/drivers/media/video/tcm825x.c +++ b/drivers/media/video/tcm825x.c | |||
| @@ -50,7 +50,7 @@ struct tcm825x_sensor { | |||
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /* list of image formats supported by TCM825X sensor */ | 52 | /* list of image formats supported by TCM825X sensor */ |
| 53 | const static struct v4l2_fmtdesc tcm825x_formats[] = { | 53 | static const struct v4l2_fmtdesc tcm825x_formats[] = { |
| 54 | { | 54 | { |
| 55 | .description = "YUYV (YUV 4:2:2), packed", | 55 | .description = "YUYV (YUV 4:2:2), packed", |
| 56 | .pixelformat = V4L2_PIX_FMT_UYVY, | 56 | .pixelformat = V4L2_PIX_FMT_UYVY, |
| @@ -76,15 +76,15 @@ const static struct v4l2_fmtdesc tcm825x_formats[] = { | |||
| 76 | * TCM825X register configuration for all combinations of pixel format and | 76 | * TCM825X register configuration for all combinations of pixel format and |
| 77 | * image size | 77 | * image size |
| 78 | */ | 78 | */ |
| 79 | const static struct tcm825x_reg subqcif = { 0x20, TCM825X_PICSIZ }; | 79 | static const struct tcm825x_reg subqcif = { 0x20, TCM825X_PICSIZ }; |
| 80 | const static struct tcm825x_reg qcif = { 0x18, TCM825X_PICSIZ }; | 80 | static const struct tcm825x_reg qcif = { 0x18, TCM825X_PICSIZ }; |
| 81 | const static struct tcm825x_reg cif = { 0x14, TCM825X_PICSIZ }; | 81 | static const struct tcm825x_reg cif = { 0x14, TCM825X_PICSIZ }; |
| 82 | const static struct tcm825x_reg qqvga = { 0x0c, TCM825X_PICSIZ }; | 82 | static const struct tcm825x_reg qqvga = { 0x0c, TCM825X_PICSIZ }; |
| 83 | const static struct tcm825x_reg qvga = { 0x04, TCM825X_PICSIZ }; | 83 | static const struct tcm825x_reg qvga = { 0x04, TCM825X_PICSIZ }; |
| 84 | const static struct tcm825x_reg vga = { 0x00, TCM825X_PICSIZ }; | 84 | static const struct tcm825x_reg vga = { 0x00, TCM825X_PICSIZ }; |
| 85 | 85 | ||
| 86 | const static struct tcm825x_reg yuv422 = { 0x00, TCM825X_PICFMT }; | 86 | static const struct tcm825x_reg yuv422 = { 0x00, TCM825X_PICFMT }; |
| 87 | const static struct tcm825x_reg rgb565 = { 0x02, TCM825X_PICFMT }; | 87 | static const struct tcm825x_reg rgb565 = { 0x02, TCM825X_PICFMT }; |
| 88 | 88 | ||
| 89 | /* Our own specific controls */ | 89 | /* Our own specific controls */ |
| 90 | #define V4L2_CID_ALC V4L2_CID_PRIVATE_BASE | 90 | #define V4L2_CID_ALC V4L2_CID_PRIVATE_BASE |
| @@ -248,10 +248,10 @@ static struct vcontrol { | |||
| 248 | }; | 248 | }; |
| 249 | 249 | ||
| 250 | 250 | ||
| 251 | const static struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] = | 251 | static const struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] = |
| 252 | { &subqcif, &qqvga, &qcif, &qvga, &cif, &vga }; | 252 | { &subqcif, &qqvga, &qcif, &qvga, &cif, &vga }; |
| 253 | 253 | ||
| 254 | const static struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] = | 254 | static const struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] = |
| 255 | { &yuv422, &rgb565 }; | 255 | { &yuv422, &rgb565 }; |
| 256 | 256 | ||
| 257 | /* | 257 | /* |