These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / i2c / saa6752hs.c

diff --git a/kernel/drivers/media/i2c/saa6752hs.c b/kernel/drivers/media/i2c/saa6752hs.c
index f14c0e6..7202d3a 100644 (file)
--- a/kernel/drivers/media/i2c/saa6752hs.c
+++ b/kernel/drivers/media/i2c/saa6752hs.c
@@ -554,10 +554,16 @@ static int saa6752hs_init(struct v4l2_subdev *sd, u32 leading_null_bytes)
        return 0;
 }
 
-static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
+static int saa6752hs_get_fmt(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_format *format)
 {
+       struct v4l2_mbus_framefmt *f = &format->format;
        struct saa6752hs_state *h = to_state(sd);
 
+       if (format->pad)
+               return -EINVAL;
+
        if (h->video_format == SAA6752HS_VF_UNKNOWN)
                h->video_format = SAA6752HS_VF_D1;
        f->width = v4l2_format_table[h->video_format].fmt.pix.width;
@@ -568,10 +574,17 @@ static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
        return 0;
 }
 
-static int saa6752hs_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
+static int saa6752hs_set_fmt(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_format *format)
 {
+       struct v4l2_mbus_framefmt *f = &format->format;
+       struct saa6752hs_state *h = to_state(sd);
        int dist_352, dist_480, dist_720;
 
+       if (format->pad)
+               return -EINVAL;
+
        f->code = MEDIA_BUS_FMT_FIXED;
 
        dist_352 = abs(f->width - 352);
@@ -592,15 +605,11 @@ static int saa6752hs_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_frame
        }
        f->field = V4L2_FIELD_INTERLACED;
        f->colorspace = V4L2_COLORSPACE_SMPTE170M;
-       return 0;
-}
-
-static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
-{
-       struct saa6752hs_state *h = to_state(sd);
 
-       if (f->code != MEDIA_BUS_FMT_FIXED)
-               return -EINVAL;
+       if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+               cfg->try_fmt = *f;
+               return 0;
+       }
 
        /*
          FIXME: translate and round width/height into EMPRESS
@@ -614,7 +623,9 @@ static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
          D1     | 720x576 | 720x480
        */
 
-       saa6752hs_try_mbus_fmt(sd, f);
+       if (f->code != MEDIA_BUS_FMT_FIXED)
+               return -EINVAL;
+
        if (f->width == 720)
                h->video_format = SAA6752HS_VF_D1;
        else if (f->width == 480)
@@ -647,14 +658,17 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = {
 
 static const struct v4l2_subdev_video_ops saa6752hs_video_ops = {
        .s_std = saa6752hs_s_std,
-       .s_mbus_fmt = saa6752hs_s_mbus_fmt,
-       .try_mbus_fmt = saa6752hs_try_mbus_fmt,
-       .g_mbus_fmt = saa6752hs_g_mbus_fmt,
+};
+
+static const struct v4l2_subdev_pad_ops saa6752hs_pad_ops = {
+       .get_fmt = saa6752hs_get_fmt,
+       .set_fmt = saa6752hs_set_fmt,
 };
 
 static const struct v4l2_subdev_ops saa6752hs_ops = {
        .core = &saa6752hs_core_ops,
        .video = &saa6752hs_video_ops,
+       .pad = &saa6752hs_pad_ops,
 };
 
 static int saa6752hs_probe(struct i2c_client *client,
@@ -779,7 +793,6 @@ MODULE_DEVICE_TABLE(i2c, saa6752hs_id);
 
 static struct i2c_driver saa6752hs_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "saa6752hs",
        },
        .probe          = saa6752hs_probe,