Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / drivers / media / video / cpia2 / cpia2_core.c

diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index 1cc0df8..9606bc0 100644 (file)
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -1058,44 +1058,44 @@ static int set_vw_size(struct camera_data *cam, int size)
                DBG("Setting size to VGA\n");
                cam->params.roi.width = STV_IMAGE_VGA_COLS;
                cam->params.roi.height = STV_IMAGE_VGA_ROWS;
-               cam->vw.width = STV_IMAGE_VGA_COLS;
-               cam->vw.height = STV_IMAGE_VGA_ROWS;
+               cam->width = STV_IMAGE_VGA_COLS;
+               cam->height = STV_IMAGE_VGA_ROWS;
                break;
        case VIDEOSIZE_CIF:
                DBG("Setting size to CIF\n");
                cam->params.roi.width = STV_IMAGE_CIF_COLS;
                cam->params.roi.height = STV_IMAGE_CIF_ROWS;
-               cam->vw.width = STV_IMAGE_CIF_COLS;
-               cam->vw.height = STV_IMAGE_CIF_ROWS;
+               cam->width = STV_IMAGE_CIF_COLS;
+               cam->height = STV_IMAGE_CIF_ROWS;
                break;
        case VIDEOSIZE_QVGA:
                DBG("Setting size to QVGA\n");
                cam->params.roi.width = STV_IMAGE_QVGA_COLS;
                cam->params.roi.height = STV_IMAGE_QVGA_ROWS;
-               cam->vw.width = STV_IMAGE_QVGA_COLS;
-               cam->vw.height = STV_IMAGE_QVGA_ROWS;
+               cam->width = STV_IMAGE_QVGA_COLS;
+               cam->height = STV_IMAGE_QVGA_ROWS;
                break;
        case VIDEOSIZE_288_216:
                cam->params.roi.width = 288;
                cam->params.roi.height = 216;
-               cam->vw.width = 288;
-               cam->vw.height = 216;
+               cam->width = 288;
+               cam->height = 216;
                break;
        case VIDEOSIZE_256_192:
-               cam->vw.width = 256;
-               cam->vw.height = 192;
+               cam->width = 256;
+               cam->height = 192;
                cam->params.roi.width = 256;
                cam->params.roi.height = 192;
                break;
        case VIDEOSIZE_224_168:
-               cam->vw.width = 224;
-               cam->vw.height = 168;
+               cam->width = 224;
+               cam->height = 168;
                cam->params.roi.width = 224;
                cam->params.roi.height = 168;
                break;
        case VIDEOSIZE_192_144:
-               cam->vw.width = 192;
-               cam->vw.height = 144;
+               cam->width = 192;
+               cam->height = 144;
                cam->params.roi.width = 192;
                cam->params.roi.height = 144;
                break;
@@ -1103,8 +1103,8 @@ static int set_vw_size(struct camera_data *cam, int size)
                DBG("Setting size to QCIF\n");
                cam->params.roi.width = STV_IMAGE_QCIF_COLS;
                cam->params.roi.height = STV_IMAGE_QCIF_ROWS;
-               cam->vw.width = STV_IMAGE_QCIF_COLS;
-               cam->vw.height = STV_IMAGE_QCIF_ROWS;
+               cam->width = STV_IMAGE_QCIF_COLS;
+               cam->height = STV_IMAGE_QCIF_ROWS;
                break;
        default:
                retval = -EINVAL;
@@ -2224,23 +2224,8 @@ static void reset_camera_struct(struct camera_data *cam)
                cam->params.roi.height = STV_IMAGE_CIF_ROWS;
        }
 
-       /***
-        * Fill in the v4l structures.  video_cap is filled in inside the VIDIOCCAP
-        * Ioctl.  Here, just do the window and picture stucts.
-        ***/
-       cam->vp.palette = (u16) VIDEO_PALETTE_RGB24;    /* Is this right? */
-       cam->vp.brightness = (u16) cam->params.color_params.brightness * 256;
-       cam->vp.colour = (u16) cam->params.color_params.saturation * 256;
-       cam->vp.contrast = (u16) cam->params.color_params.contrast * 256;
-
-       cam->vw.x = 0;
-       cam->vw.y = 0;
-       cam->vw.width = cam->params.roi.width;
-       cam->vw.height = cam->params.roi.height;
-       cam->vw.flags = 0;
-       cam->vw.clipcount = 0;
-
-       return;
+       cam->width = cam->params.roi.width;
+       cam->height = cam->params.roi.height;
 }
 
 /******************************************************************************