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

Pull media updates from Mauro Carvalho Chehab:

 - Some cleanups at V4L2 documentation

 - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
   sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
   driver

 - Lots of missing MAINTAINERS entries added

 - several em28xx driver improvements, including its conversion to
   videobuf2

 - several fixups on drivers to make them to better comply with the API

 - DVB core: add support for DVBv5 stats, allowing the implementation of
   statistics for new standards like ISDB

 - mb86a20s: add statistics to the driver

 - lots of new board additions, cleanups, and driver improvements.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
  [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
  [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
  [media] em28xx: add usb id for terratec h5 rev. 3
  [media] media: rc: gpio-ir-recv: add support for device tree parsing
  [media] mceusb: move check earlier to make smatch happy
  [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
  [media] staging: media: Remove unnecessary OOM messages
  [media] sh_vou: Use vou_dev instead of vou_file wherever possible
  [media] sh_vou: Use video_drvdata()
  [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
  [media] mt9t112: mt9t111 format set up differs from mt9t112
  [media] sh-mobile-ceu-camera: fix SHARPNESS control default
  Revert "[media] fc0011: Return early, if the frequency is already tuned"
  [media] cx18/ivtv: fix regression: remove __init from a non-init function
  [media] em28xx: fix analog streaming with USB bulk transfers
  [media] stv0900: remove unnecessary null pointer check
  [media] fc0011: Return early, if the frequency is already tuned
  [media] fc0011: Add some sanity checks and cleanups
  [media] fc0011: Fix xin value clamping
  Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
  ...

1 files changed, 24 insertions, 21 deletions

diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index de7cd836b0a2..188e29b03273 100644
--- a/drivers/media/i2c/soc_camera/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
@@ -92,6 +92,7 @@ struct mt9t112_priv {
         struct v4l2_rect                 frame;
         const struct mt9t112_format     *format;
         int                              model;
+        int                              num_formats;
         u32                              flags;
 /* for flags */
 #define INIT_DONE       (1 << 0)
@@ -779,9 +780,9 @@ static int mt9t112_s_register(struct v4l2_subdev *sd,
 static int mt9t112_s_power(struct v4l2_subdev *sd, int on)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
-        return soc_camera_set_power(&client->dev, icl, on);
+        return soc_camera_set_power(&client->dev, ssdd, on);
 }
 
 static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
@@ -859,11 +860,11 @@ static int mt9t112_set_params(struct mt9t112_priv *priv,
         /*
          * get color format
          */
-        for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+        for (i = 0; i < priv->num_formats; i++)
                 if (mt9t112_cfmts[i].code == code)
                         break;
 
-        if (i == ARRAY_SIZE(mt9t112_cfmts))
+        if (i == priv->num_formats)
                 return -EINVAL;
 
         priv->frame  = *rect;
@@ -955,14 +956,16 @@ static int mt9t112_s_fmt(struct v4l2_subdev *sd,
 static int mt9t112_try_fmt(struct v4l2_subdev *sd,
                            struct v4l2_mbus_framefmt *mf)
 {
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9t112_priv *priv = to_mt9t112(client);
         unsigned int top, left;
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+        for (i = 0; i < priv->num_formats; i++)
                 if (mt9t112_cfmts[i].code == mf->code)
                         break;
 
-        if (i == ARRAY_SIZE(mt9t112_cfmts)) {
+        if (i == priv->num_formats) {
                 mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         } else {
@@ -979,7 +982,10 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
 static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                            enum v4l2_mbus_pixelcode *code)
 {
-        if (index >= ARRAY_SIZE(mt9t112_cfmts))
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9t112_priv *priv = to_mt9t112(client);
+
+        if (index >= priv->num_formats)
                 return -EINVAL;
 
         *code = mt9t112_cfmts[index].code;
@@ -991,13 +997,13 @@ static int mt9t112_g_mbus_config(struct v4l2_subdev *sd,
                                  struct v4l2_mbus_config *cfg)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
         cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
                 V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH |
                 V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING;
         cfg->type = V4L2_MBUS_PARALLEL;
-        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);
 
         return 0;
 }
@@ -1006,10 +1012,10 @@ static int mt9t112_s_mbus_config(struct v4l2_subdev *sd,
                                  const struct v4l2_mbus_config *cfg)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
         struct mt9t112_priv *priv = to_mt9t112(client);
 
-        if (soc_camera_apply_board_flags(icl, cfg) & V4L2_MBUS_PCLK_SAMPLE_RISING)
+        if (soc_camera_apply_board_flags(ssdd, cfg) & V4L2_MBUS_PCLK_SAMPLE_RISING)
                 priv->flags |= PCLK_RISING;
 
         return 0;
@@ -1056,10 +1062,12 @@ static int mt9t112_camera_probe(struct i2c_client *client)
         case 0x2680:
                 devname = "mt9t111";
                 priv->model = V4L2_IDENT_MT9T111;
+                priv->num_formats = 1;
                 break;
         case 0x2682:
                 devname = "mt9t112";
                 priv->model = V4L2_IDENT_MT9T112;
+                priv->num_formats = ARRAY_SIZE(mt9t112_cfmts);
                 break;
         default:
                 dev_err(&client->dev, "Product ID error %04x\n", chipid);
@@ -1078,7 +1086,7 @@ static int mt9t112_probe(struct i2c_client *client,
                          const struct i2c_device_id *did)
 {
         struct mt9t112_priv *priv;
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
         struct v4l2_rect rect = {
                 .width = VGA_WIDTH,
                 .height = VGA_HEIGHT,
@@ -1087,24 +1095,22 @@ static int mt9t112_probe(struct i2c_client *client,
         };
         int ret;
 
-        if (!icl || !icl->priv) {
+        if (!ssdd || !ssdd->drv_priv) {
                 dev_err(&client->dev, "mt9t112: missing platform data!\n");
                 return -EINVAL;
         }
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
-        priv->info = icl->priv;
+        priv->info = ssdd->drv_priv;
 
         v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
 
         ret = mt9t112_camera_probe(client);
-        if (ret) {
-                kfree(priv);
+        if (ret)
                 return ret;
-        }
 
         /* Cannot fail: using the default supported pixel code */
         mt9t112_set_params(priv, &rect, V4L2_MBUS_FMT_UYVY8_2X8);
@@ -1114,9 +1120,6 @@ static int mt9t112_probe(struct i2c_client *client,
 
 static int mt9t112_remove(struct i2c_client *client)
 {
-        struct mt9t112_priv *priv = to_mt9t112(client);
-
-        kfree(priv);
         return 0;
 }