aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov7670.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2006-12-01 13:37:49 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 06:05:31 -0500
commita66d23368068d6027feedc010304d510e6d1fe56 (patch)
tree01dafb7ad67524c516922a379f079cbe91e1466c /drivers/media/video/ov7670.c
parentbf5dbed6b499787809c78710b209efc76939592b (diff)
V4L/DVB (4908): Remove the fake RGB32 format from cafe_ccic
Remove RGB32, useful for debugging, but with no place in production. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r--drivers/media/video/ov7670.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index b7d824ee03ea..7d380d76338a 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -497,19 +497,6 @@ static struct ov7670_format_struct {
497 .regs = ov7670_fmt_rgb565, 497 .regs = ov7670_fmt_rgb565,
498 .cmatrix = { 179, -179, 0, -61, -176, 228 }, 498 .cmatrix = { 179, -179, 0, -61, -176, 228 },
499 }, 499 },
500 /*
501 * Pretend we do RGB32. This is here on the assumption that the
502 * upper layer will reformat RGB444 appropriately.
503 *
504 * The entire purpose for this thing's existence is to enable easy
505 * display of RGB444 for debugging purposes. It will come out soon.
506 */
507 {
508 .desc = "RGB32 (faked)",
509 .pixelformat = V4L2_PIX_FMT_RGB32,
510 .regs = ov7670_fmt_rgb444,
511 .cmatrix = { 179, -179, 0, -61, -176, 228 },
512 },
513}; 500};
514#define N_OV7670_FMTS (sizeof(ov7670_formats)/sizeof(ov7670_formats[0])) 501#define N_OV7670_FMTS (sizeof(ov7670_formats)/sizeof(ov7670_formats[0]))
515 502
@@ -694,8 +681,6 @@ static int ov7670_try_fmt(struct i2c_client *c, struct v4l2_format *fmt,
694 pix->width = wsize->width; 681 pix->width = wsize->width;
695 pix->height = wsize->height; 682 pix->height = wsize->height;
696 pix->bytesperline = pix->width*BYTES_PER_PIXEL; 683 pix->bytesperline = pix->width*BYTES_PER_PIXEL;
697 if (pix->pixelformat == V4L2_PIX_FMT_RGB32)
698 pix->bytesperline *= 2;
699 pix->sizeimage = pix->height*pix->bytesperline; 684 pix->sizeimage = pix->height*pix->bytesperline;
700 return 0; 685 return 0;
701} 686}