V4L/DVB (8201): gspca: v4l2_pix_format in each subdriver.

main:     Parameter comp_fac removed.
main, pac207:
          get_buff_size op removed.
(all)     v4l2_pix_format in each subdriver.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 8561234d65e2..f9bffd67991e 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -22,8 +22,8 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 4)
-static const char version[] = "2.1.4";
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 1, 5)
+static const char version[] = "2.1.5";
 
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("TV8532 USB Camera Driver");
@@ -81,9 +81,17 @@ static struct ctrl sd_ctrls[] = {
          },
 };
 
-static struct cam_mode sif_mode[] = {
-        {V4L2_PIX_FMT_SBGGR8, 176, 144, 1},
-        {V4L2_PIX_FMT_SBGGR8, 352, 288, 0},
+static struct v4l2_pix_format sif_mode[] = {
+        {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 176,
+                .sizeimage = 176 * 144,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1},
+        {352, 288, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 352,
+                .sizeimage = 352 * 288,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0},
 };
 
 /*
@@ -440,7 +448,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         /************************************************/
         data = TESTCOMP;        /* 0x72 compressed mode */
         reg_w(dev, TV8532_QUANT_COMP, &data, 1);        /* 0x28 */
-        if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].mode) {
+        if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv) {
                 /* 176x144 */
                 data = QCIFLINE;        /* 0x84; // CIF | 4 packet */
                 reg_w(dev, TV8532_MODE_PACKET, &data, 1);       /* 0x29 */