Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

1 files changed, 26 insertions, 61 deletions

diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c
index 0b031336eab..23a55b5814f 100644
--- a/drivers/media/video/pwc/pwc-misc.c
+++ b/drivers/media/video/pwc/pwc-misc.c
@@ -27,67 +27,47 @@
 
 #include "pwc.h"
 
-const struct pwc_coord pwc_image_sizes[PSZ_MAX] =
+const int pwc_image_sizes[PSZ_MAX][2] =
 {
-        { 128,  96, 0 }, /* sqcif */
-        { 160, 120, 0 }, /* qsif */
-        { 176, 144, 0 }, /* qcif */
-        { 320, 240, 0 }, /* sif */
-        { 352, 288, 0 }, /* cif */
-        { 640, 480, 0 }, /* vga */
+        { 128,  96 }, /* sqcif */
+        { 160, 120 }, /* qsif */
+        { 176, 144 }, /* qcif */
+        { 320, 240 }, /* sif */
+        { 352, 288 }, /* cif */
+        { 640, 480 }, /* vga */
 };
 
 /* x,y -> PSZ_ */
-int pwc_decode_size(struct pwc_device *pdev, int width, int height)
+int pwc_get_size(struct pwc_device *pdev, int width, int height)
 {
-        int i, find;
-
-        /* Make sure we don't go beyond our max size.
-           NB: we have different limits for RAW and normal modes. In case
-           you don't have the decompressor loaded or use RAW mode,
-           the maximum viewable size is smaller.
-        */
-        if (pdev->pixfmt != V4L2_PIX_FMT_YUV420)
-        {
-                if (width > pdev->abs_max.x || height > pdev->abs_max.y)
-                {
-                        PWC_DEBUG_SIZE("VIDEO_PALETTE_RAW: going beyond abs_max.\n");
-                        return -1;
-                }
-        }
-        else
-        {
-                if (width > pdev->view_max.x || height > pdev->view_max.y)
-                {
-                        PWC_DEBUG_SIZE("VIDEO_PALETTE_not RAW: going beyond view_max.\n");
-                        return -1;
-                }
-        }
+        int i;
 
         /* Find the largest size supported by the camera that fits into the
-           requested size.
-         */
-        find = -1;
+           requested size. */
+        for (i = PSZ_MAX - 1; i >= 0; i--) {
+                if (!(pdev->image_mask & (1 << i)))
+                        continue;
+
+                if (pwc_image_sizes[i][0] <= width &&
+                    pwc_image_sizes[i][1] <= height)
+                        return i;
+        }
+
+        /* No mode found, return the smallest mode we have */
         for (i = 0; i < PSZ_MAX; i++) {
-                if (pdev->image_mask & (1 << i)) {
-                        if (pwc_image_sizes[i].x <= width && pwc_image_sizes[i].y <= height)
-                                find = i;
-                }
+                if (pdev->image_mask & (1 << i))
+                        return i;
         }
-        return find;
+
+        /* Never reached there always is atleast one supported mode */
+        return 0;
 }
 
-/* initialize variables depending on type and decompressor*/
+/* initialize variables depending on type and decompressor */
 void pwc_construct(struct pwc_device *pdev)
 {
         if (DEVICE_USE_CODEC1(pdev->type)) {
 
-                pdev->view_min.x = 128;
-                pdev->view_min.y =  96;
-                pdev->view_max.x = 352;
-                pdev->view_max.y = 288;
-                pdev->abs_max.x  = 352;
-                pdev->abs_max.y  = 288;
                 pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QCIF | 1 << PSZ_CIF;
                 pdev->vcinterface = 2;
                 pdev->vendpoint = 4;
@@ -96,13 +76,7 @@ void pwc_construct(struct pwc_device *pdev)
 
         } else if (DEVICE_USE_CODEC3(pdev->type)) {
 
-                pdev->view_min.x = 160;
-                pdev->view_min.y = 120;
-                pdev->view_max.x = 640;
-                pdev->view_max.y = 480;
                 pdev->image_mask = 1 << PSZ_QSIF | 1 << PSZ_SIF | 1 << PSZ_VGA;
-                pdev->abs_max.x = 640;
-                pdev->abs_max.y = 480;
                 pdev->vcinterface = 3;
                 pdev->vendpoint = 5;
                 pdev->frame_header_size = TOUCAM_HEADER_SIZE;
@@ -110,20 +84,11 @@ void pwc_construct(struct pwc_device *pdev)
 
         } else /* if (DEVICE_USE_CODEC2(pdev->type)) */ {
 
-                pdev->view_min.x = 128;
-                pdev->view_min.y =  96;
-                /* Anthill bug #38: PWC always reports max size, even without PWCX */
-                pdev->view_max.x = 640;
-                pdev->view_max.y = 480;
                 pdev->image_mask = 1 << PSZ_SQCIF | 1 << PSZ_QSIF | 1 << PSZ_QCIF | 1 << PSZ_SIF | 1 << PSZ_CIF | 1 << PSZ_VGA;
-                pdev->abs_max.x = 640;
-                pdev->abs_max.y = 480;
                 pdev->vcinterface = 3;
                 pdev->vendpoint = 4;
                 pdev->frame_header_size = 0;
                 pdev->frame_trailer_size = 0;
         }
         pdev->pixfmt = V4L2_PIX_FMT_YUV420; /* default */
-        pdev->view_min.size = pdev->view_min.x * pdev->view_min.y;
-        pdev->view_max.size = pdev->view_max.x * pdev->view_max.y;
 }