Merge branch 'patchwork' into v4l_for_linus

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...

2 files changed, 45 insertions, 29 deletions

diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index ee0f57e01b56..08b234bd2962 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -824,10 +824,11 @@ static const struct s5c73m3_frame_size *s5c73m3_find_frame_size(
 }
 
 static void s5c73m3_oif_try_format(struct s5c73m3 *state,
-                                   struct v4l2_subdev_fh *fh,
+                                   struct v4l2_subdev_pad_config *cfg,
                                    struct v4l2_subdev_format *fmt,
                                    const struct s5c73m3_frame_size **fs)
 {
+        struct v4l2_subdev *sd = &state->sensor_sd;
         u32 code;
 
         switch (fmt->pad) {
@@ -850,7 +851,7 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
                         *fs = state->oif_pix_size[RES_ISP];
                 else
                         *fs = s5c73m3_find_frame_size(
-                                                v4l2_subdev_get_try_format(fh,
+                                                v4l2_subdev_get_try_format(sd, cfg,
                                                         OIF_ISP_PAD),
                                                 RES_ISP);
                 break;
@@ -860,7 +861,7 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
 }
 
 static void s5c73m3_try_format(struct s5c73m3 *state,
-                              struct v4l2_subdev_fh *fh,
+                              struct v4l2_subdev_pad_config *cfg,
                               struct v4l2_subdev_format *fmt,
                               const struct s5c73m3_frame_size **fs)
 {
@@ -952,7 +953,7 @@ static int s5c73m3_oif_s_frame_interval(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_oif_enum_frame_interval(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_fh *fh,
+                              struct v4l2_subdev_pad_config *cfg,
                               struct v4l2_subdev_frame_interval_enum *fie)
 {
         struct s5c73m3 *state = oif_sd_to_s5c73m3(sd);
@@ -990,7 +991,7 @@ static int s5c73m3_oif_get_pad_code(int pad, int index)
 }
 
 static int s5c73m3_get_fmt(struct v4l2_subdev *sd,
-                           struct v4l2_subdev_fh *fh,
+                           struct v4l2_subdev_pad_config *cfg,
                            struct v4l2_subdev_format *fmt)
 {
         struct s5c73m3 *state = sensor_sd_to_s5c73m3(sd);
@@ -998,7 +999,7 @@ static int s5c73m3_get_fmt(struct v4l2_subdev *sd,
         u32 code;
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                fmt->format = *v4l2_subdev_get_try_format(fh, fmt->pad);
+                fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 return 0;
         }
 
@@ -1024,7 +1025,7 @@ static int s5c73m3_get_fmt(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_oif_get_fmt(struct v4l2_subdev *sd,
-                           struct v4l2_subdev_fh *fh,
+                           struct v4l2_subdev_pad_config *cfg,
                            struct v4l2_subdev_format *fmt)
 {
         struct s5c73m3 *state = oif_sd_to_s5c73m3(sd);
@@ -1032,7 +1033,7 @@ static int s5c73m3_oif_get_fmt(struct v4l2_subdev *sd,
         u32 code;
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                fmt->format = *v4l2_subdev_get_try_format(fh, fmt->pad);
+                fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 return 0;
         }
 
@@ -1062,7 +1063,7 @@ static int s5c73m3_oif_get_fmt(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_set_fmt(struct v4l2_subdev *sd,
-                           struct v4l2_subdev_fh *fh,
+                           struct v4l2_subdev_pad_config *cfg,
                            struct v4l2_subdev_format *fmt)
 {
         const struct s5c73m3_frame_size *frame_size = NULL;
@@ -1072,10 +1073,10 @@ static int s5c73m3_set_fmt(struct v4l2_subdev *sd,
 
         mutex_lock(&state->lock);
 
-        s5c73m3_try_format(state, fh, fmt, &frame_size);
+        s5c73m3_try_format(state, cfg, fmt, &frame_size);
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mf = v4l2_subdev_get_try_format(fh, fmt->pad);
+                mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 *mf = fmt->format;
         } else {
                 switch (fmt->pad) {
@@ -1101,7 +1102,7 @@ static int s5c73m3_set_fmt(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_oif_set_fmt(struct v4l2_subdev *sd,
-                         struct v4l2_subdev_fh *fh,
+                         struct v4l2_subdev_pad_config *cfg,
                          struct v4l2_subdev_format *fmt)
 {
         const struct s5c73m3_frame_size *frame_size = NULL;
@@ -1111,13 +1112,13 @@ static int s5c73m3_oif_set_fmt(struct v4l2_subdev *sd,
 
         mutex_lock(&state->lock);
 
-        s5c73m3_oif_try_format(state, fh, fmt, &frame_size);
+        s5c73m3_oif_try_format(state, cfg, fmt, &frame_size);
 
         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mf = v4l2_subdev_get_try_format(fh, fmt->pad);
+                mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
                 *mf = fmt->format;
                 if (fmt->pad == OIF_ISP_PAD) {
-                        mf = v4l2_subdev_get_try_format(fh, OIF_SOURCE_PAD);
+                        mf = v4l2_subdev_get_try_format(sd, cfg, OIF_SOURCE_PAD);
                         mf->width = fmt->format.width;
                         mf->height = fmt->format.height;
                 }
@@ -1189,7 +1190,7 @@ static int s5c73m3_oif_set_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
 }
 
 static int s5c73m3_enum_mbus_code(struct v4l2_subdev *sd,
-                                  struct v4l2_subdev_fh *fh,
+                                  struct v4l2_subdev_pad_config *cfg,
                                   struct v4l2_subdev_mbus_code_enum *code)
 {
         static const int codes[] = {
@@ -1205,7 +1206,7 @@ static int s5c73m3_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_oif_enum_mbus_code(struct v4l2_subdev *sd,
-                                struct v4l2_subdev_fh *fh,
+                                struct v4l2_subdev_pad_config *cfg,
                                 struct v4l2_subdev_mbus_code_enum *code)
 {
         int ret;
@@ -1220,7 +1221,7 @@ static int s5c73m3_oif_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_enum_frame_size(struct v4l2_subdev *sd,
-                                   struct v4l2_subdev_fh *fh,
+                                   struct v4l2_subdev_pad_config *cfg,
                                    struct v4l2_subdev_frame_size_enum *fse)
 {
         int idx;
@@ -1247,9 +1248,10 @@ static int s5c73m3_enum_frame_size(struct v4l2_subdev *sd,
 }
 
 static int s5c73m3_oif_enum_frame_size(struct v4l2_subdev *sd,
-                                   struct v4l2_subdev_fh *fh,
+                                   struct v4l2_subdev_pad_config *cfg,
                                    struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct s5c73m3 *state = oif_sd_to_s5c73m3(sd);
         int idx;
 
         if (fse->pad == OIF_SOURCE_PAD) {
@@ -1259,11 +1261,25 @@ static int s5c73m3_oif_enum_frame_size(struct v4l2_subdev *sd,
                 switch (fse->code) {
                 case S5C73M3_JPEG_FMT:
                 case S5C73M3_ISP_FMT: {
-                        struct v4l2_mbus_framefmt *mf =
-                                v4l2_subdev_get_try_format(fh, OIF_ISP_PAD);
+                        unsigned w, h;
+
+                        if (fse->which == V4L2_SUBDEV_FORMAT_TRY) {
+                                struct v4l2_mbus_framefmt *mf;
+
+                                mf = v4l2_subdev_get_try_format(sd, cfg,
+                                                                OIF_ISP_PAD);
+
+                                w = mf->width;
+                                h = mf->height;
+                        } else {
+                                const struct s5c73m3_frame_size *fs;
 
-                        fse->max_width = fse->min_width = mf->width;
-                        fse->max_height = fse->min_height = mf->height;
+                                fs = state->oif_pix_size[RES_ISP];
+                                w = fs->width;
+                                h = fs->height;
+                        }
+                        fse->max_width = fse->min_width = w;
+                        fse->max_height = fse->min_height = h;
                         return 0;
                 }
                 default:
@@ -1306,11 +1322,11 @@ static int s5c73m3_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
         struct v4l2_mbus_framefmt *mf;
 
-        mf = v4l2_subdev_get_try_format(fh, S5C73M3_ISP_PAD);
+        mf = v4l2_subdev_get_try_format(sd, fh->pad, S5C73M3_ISP_PAD);
         s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                 S5C73M3_ISP_FMT);
 
-        mf = v4l2_subdev_get_try_format(fh, S5C73M3_JPEG_PAD);
+        mf = v4l2_subdev_get_try_format(sd, fh->pad, S5C73M3_JPEG_PAD);
         s5c73m3_fill_mbus_fmt(mf, &s5c73m3_jpeg_resolutions[1],
                                         S5C73M3_JPEG_FMT);
 
@@ -1321,15 +1337,15 @@ static int s5c73m3_oif_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
         struct v4l2_mbus_framefmt *mf;
 
-        mf = v4l2_subdev_get_try_format(fh, OIF_ISP_PAD);
+        mf = v4l2_subdev_get_try_format(sd, fh->pad, OIF_ISP_PAD);
         s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                 S5C73M3_ISP_FMT);
 
-        mf = v4l2_subdev_get_try_format(fh, OIF_JPEG_PAD);
+        mf = v4l2_subdev_get_try_format(sd, fh->pad, OIF_JPEG_PAD);
         s5c73m3_fill_mbus_fmt(mf, &s5c73m3_jpeg_resolutions[1],
                                         S5C73M3_JPEG_FMT);
 
-        mf = v4l2_subdev_get_try_format(fh, OIF_SOURCE_PAD);
+        mf = v4l2_subdev_get_try_format(sd, fh->pad, OIF_SOURCE_PAD);
         s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                 S5C73M3_ISP_FMT);
         return 0;
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
index f60b265b4da1..63eb19093381 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
@@ -52,7 +52,7 @@ static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len,
                 xfer.rx_buf = addr;
 
         if (spi_dev == NULL) {
-                dev_err(&spi_dev->dev, "SPI device is uninitialized\n");
+                pr_err("SPI device is uninitialized\n");
                 return -ENODEV;
         }