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"
  ...

8 files changed, 48 insertions, 47 deletions

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 7c1116c73bf3..8de1b3dce459 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -656,7 +656,7 @@ static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd,
         dev_dbg(hdev->dev, "%s\n", __func__);
         if (!hdev->cur_conf)
                 return -EINVAL;
-        memset(fmt, 0, sizeof *fmt);
+        memset(fmt, 0, sizeof(*fmt));
         fmt->width = t->hact.end - t->hact.beg;
         fmt->height = t->vact[0].end - t->vact[0].beg;
         fmt->code = V4L2_MBUS_FMT_FIXED; /* means RGB888 */
@@ -760,7 +760,7 @@ static void hdmi_resources_cleanup(struct hdmi_device *hdev)
                 clk_put(res->sclk_hdmi);
         if (!IS_ERR_OR_NULL(res->hdmi))
                 clk_put(res->hdmi);
-        memset(res, 0, sizeof *res);
+        memset(res, 0, sizeof(*res));
 }
 
 static int hdmi_resources_init(struct hdmi_device *hdev)
@@ -777,31 +777,31 @@ static int hdmi_resources_init(struct hdmi_device *hdev)
 
         dev_dbg(dev, "HDMI resource init\n");
 
-        memset(res, 0, sizeof *res);
+        memset(res, 0, sizeof(*res));
         /* get clocks, power */
 
         res->hdmi = clk_get(dev, "hdmi");
-        if (IS_ERR_OR_NULL(res->hdmi)) {
+        if (IS_ERR(res->hdmi)) {
                 dev_err(dev, "failed to get clock 'hdmi'\n");
                 goto fail;
         }
         res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
-        if (IS_ERR_OR_NULL(res->sclk_hdmi)) {
+        if (IS_ERR(res->sclk_hdmi)) {
                 dev_err(dev, "failed to get clock 'sclk_hdmi'\n");
                 goto fail;
         }
         res->sclk_pixel = clk_get(dev, "sclk_pixel");
-        if (IS_ERR_OR_NULL(res->sclk_pixel)) {
+        if (IS_ERR(res->sclk_pixel)) {
                 dev_err(dev, "failed to get clock 'sclk_pixel'\n");
                 goto fail;
         }
         res->sclk_hdmiphy = clk_get(dev, "sclk_hdmiphy");
-        if (IS_ERR_OR_NULL(res->sclk_hdmiphy)) {
+        if (IS_ERR(res->sclk_hdmiphy)) {
                 dev_err(dev, "failed to get clock 'sclk_hdmiphy'\n");
                 goto fail;
         }
         res->hdmiphy = clk_get(dev, "hdmiphy");
-        if (IS_ERR_OR_NULL(res->hdmiphy)) {
+        if (IS_ERR(res->hdmiphy)) {
                 dev_err(dev, "failed to get clock 'hdmiphy'\n");
                 goto fail;
         }
@@ -955,7 +955,7 @@ static int hdmi_probe(struct platform_device *pdev)
         v4l2_subdev_init(sd, &hdmi_sd_ops);
         sd->owner = THIS_MODULE;
 
-        strlcpy(sd->name, "s5p-hdmi", sizeof sd->name);
+        strlcpy(sd->name, "s5p-hdmi", sizeof(sd->name));
         hdmi_dev->cur_preset = HDMI_DEFAULT_PRESET;
         /* FIXME: missing fail preset is not supported */
         hdmi_dev->cur_conf = hdmi_preset2timings(hdmi_dev->cur_preset);
diff --git a/drivers/media/platform/s5p-tv/hdmiphy_drv.c b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
index 06b5d2dbb2d9..80717cec76ae 100644
--- a/drivers/media/platform/s5p-tv/hdmiphy_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
@@ -284,7 +284,7 @@ static int hdmiphy_probe(struct i2c_client *client,
 {
         struct hdmiphy_ctx *ctx;
 
-        ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (!ctx)
                 return -ENOMEM;
 
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
index b671e20e9318..04e6490a45be 100644
--- a/drivers/media/platform/s5p-tv/mixer.h
+++ b/drivers/media/platform/s5p-tv/mixer.h
@@ -19,6 +19,7 @@
 #endif
 
 #include <linux/fb.h>
+#include <linux/irqreturn.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index 02faea03aa7d..5733033a6ead 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -240,27 +240,27 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
         struct device *dev = mdev->dev;
 
         res->mixer = clk_get(dev, "mixer");
-        if (IS_ERR_OR_NULL(res->mixer)) {
+        if (IS_ERR(res->mixer)) {
                 mxr_err(mdev, "failed to get clock 'mixer'\n");
                 goto fail;
         }
         res->vp = clk_get(dev, "vp");
-        if (IS_ERR_OR_NULL(res->vp)) {
+        if (IS_ERR(res->vp)) {
                 mxr_err(mdev, "failed to get clock 'vp'\n");
                 goto fail;
         }
         res->sclk_mixer = clk_get(dev, "sclk_mixer");
-        if (IS_ERR_OR_NULL(res->sclk_mixer)) {
+        if (IS_ERR(res->sclk_mixer)) {
                 mxr_err(mdev, "failed to get clock 'sclk_mixer'\n");
                 goto fail;
         }
         res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
-        if (IS_ERR_OR_NULL(res->sclk_hdmi)) {
+        if (IS_ERR(res->sclk_hdmi)) {
                 mxr_err(mdev, "failed to get clock 'sclk_hdmi'\n");
                 goto fail;
         }
         res->sclk_dac = clk_get(dev, "sclk_dac");
-        if (IS_ERR_OR_NULL(res->sclk_dac)) {
+        if (IS_ERR(res->sclk_dac)) {
                 mxr_err(mdev, "failed to get clock 'sclk_dac'\n");
                 goto fail;
         }
@@ -298,7 +298,7 @@ static void mxr_release_resources(struct mxr_device *mdev)
 {
         mxr_release_clocks(mdev);
         mxr_release_plat_resources(mdev);
-        memset(&mdev->res, 0, sizeof mdev->res);
+        memset(&mdev->res, 0, sizeof(mdev->res));
 }
 
 static void mxr_release_layers(struct mxr_device *mdev)
@@ -382,7 +382,7 @@ static int mxr_probe(struct platform_device *pdev)
         /* mdev does not exist yet so no mxr_dbg is used */
         dev_info(dev, "probe start\n");
 
-        mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
         if (!mdev) {
                 dev_err(dev, "not enough memory.\n");
                 ret = -ENOMEM;
diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
index 3b1670a045f4..b713403024ef 100644
--- a/drivers/media/platform/s5p-tv/mixer_reg.c
+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
@@ -470,11 +470,11 @@ static inline void mxr_reg_vp_filter_set(struct mxr_device *mdev,
 static void mxr_reg_vp_default_filter(struct mxr_device *mdev)
 {
         mxr_reg_vp_filter_set(mdev, VP_POLY8_Y0_LL,
-                filter_y_horiz_tap8, sizeof filter_y_horiz_tap8);
+                filter_y_horiz_tap8, sizeof(filter_y_horiz_tap8));
         mxr_reg_vp_filter_set(mdev, VP_POLY4_Y0_LL,
-                filter_y_vert_tap4, sizeof filter_y_vert_tap4);
+                filter_y_vert_tap4, sizeof(filter_y_vert_tap4));
         mxr_reg_vp_filter_set(mdev, VP_POLY4_C0_LL,
-                filter_cr_horiz_tap4, sizeof filter_cr_horiz_tap4);
+                filter_cr_horiz_tap4, sizeof(filter_cr_horiz_tap4));
 }
 
 static void mxr_reg_mxr_dump(struct mxr_device *mdev)
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 1f3b7436511c..82142a2d6d93 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -19,6 +19,7 @@
 #include <linux/videodev2.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/timer.h>
 #include <media/videobuf2-dma-contig.h>
 
@@ -95,7 +96,7 @@ int mxr_acquire_video(struct mxr_device *mdev,
                 /* trying to register next output */
                 if (sd == NULL)
                         continue;
-                out = kzalloc(sizeof *out, GFP_KERNEL);
+                out = kzalloc(sizeof(*out), GFP_KERNEL);
                 if (out == NULL) {
                         mxr_err(mdev, "no memory for '%s'\n",
                                 conf->output_name);
@@ -127,7 +128,7 @@ fail_output:
         /* kfree is NULL-safe */
         for (i = 0; i < mdev->output_cnt; ++i)
                 kfree(mdev->output[i]);
-        memset(mdev->output, 0, sizeof mdev->output);
+        memset(mdev->output, 0, sizeof(mdev->output));
 
 fail_vb2_allocator:
         /* freeing allocator context */
@@ -160,8 +161,8 @@ static int mxr_querycap(struct file *file, void *priv,
 
         mxr_dbg(layer->mdev, "%s:%d\n", __func__, __LINE__);
 
-        strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof cap->driver);
-        strlcpy(cap->card, layer->vfd.name, sizeof cap->card);
+        strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof(cap->driver));
+        strlcpy(cap->card, layer->vfd.name, sizeof(cap->card));
         sprintf(cap->bus_info, "%d", layer->idx);
         cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
@@ -192,7 +193,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
         struct mxr_device *mdev = layer->mdev;
         struct v4l2_mbus_framefmt mbus_fmt;
 
-        memset(&layer->geo, 0, sizeof layer->geo);
+        memset(&layer->geo, 0, sizeof(layer->geo));
 
         mxr_get_mbus_fmt(mdev, &mbus_fmt);
 
@@ -425,7 +426,7 @@ static int mxr_s_selection(struct file *file, void *fh,
         struct mxr_geometry tmp;
         struct v4l2_rect res;
 
-        memset(&res, 0, sizeof res);
+        memset(&res, 0, sizeof(res));
 
         mxr_dbg(layer->mdev, "%s: rect: %dx%d@%d,%d\n", __func__,
                 s->r.width, s->r.height, s->r.left, s->r.top);
@@ -464,7 +465,7 @@ static int mxr_s_selection(struct file *file, void *fh,
         /* apply change and update geometry if needed */
         if (target) {
                 /* backup current geometry if setup fails */
-                memcpy(&tmp, geo, sizeof tmp);
+                memcpy(&tmp, geo, sizeof(tmp));
 
                 /* apply requested selection */
                 target->x_offset = s->r.left;
@@ -496,7 +497,7 @@ static int mxr_s_selection(struct file *file, void *fh,
 fail:
         /* restore old geometry, which is not touched if target is NULL */
         if (target)
-                memcpy(geo, &tmp, sizeof tmp);
+                memcpy(geo, &tmp, sizeof(tmp));
         return -ERANGE;
 }
 
@@ -1071,7 +1072,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
 {
         struct mxr_layer *layer;
 
-        layer = kzalloc(sizeof *layer, GFP_KERNEL);
+        layer = kzalloc(sizeof(*layer), GFP_KERNEL);
         if (layer == NULL) {
                 mxr_err(mdev, "not enough memory for layer.\n");
                 goto fail;
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index 91a6939a270a..ab6f9ef89423 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -301,7 +301,7 @@ static int sdo_probe(struct platform_device *pdev)
         struct clk *sclk_vpll;
 
         dev_info(dev, "probe start\n");
-        sdev = devm_kzalloc(&pdev->dev, sizeof *sdev, GFP_KERNEL);
+        sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
         if (!sdev) {
                 dev_err(dev, "not enough memory.\n");
                 ret = -ENOMEM;
@@ -341,47 +341,50 @@ static int sdo_probe(struct platform_device *pdev)
 
         /* acquire clocks */
         sdev->sclk_dac = clk_get(dev, "sclk_dac");
-        if (IS_ERR_OR_NULL(sdev->sclk_dac)) {
+        if (IS_ERR(sdev->sclk_dac)) {
                 dev_err(dev, "failed to get clock 'sclk_dac'\n");
-                ret = -ENXIO;
+                ret = PTR_ERR(sdev->sclk_dac);
                 goto fail;
         }
         sdev->dac = clk_get(dev, "dac");
-        if (IS_ERR_OR_NULL(sdev->dac)) {
+        if (IS_ERR(sdev->dac)) {
                 dev_err(dev, "failed to get clock 'dac'\n");
-                ret = -ENXIO;
+                ret = PTR_ERR(sdev->dac);
                 goto fail_sclk_dac;
         }
         sdev->dacphy = clk_get(dev, "dacphy");
-        if (IS_ERR_OR_NULL(sdev->dacphy)) {
+        if (IS_ERR(sdev->dacphy)) {
                 dev_err(dev, "failed to get clock 'dacphy'\n");
-                ret = -ENXIO;
+                ret = PTR_ERR(sdev->dacphy);
                 goto fail_dac;
         }
         sclk_vpll = clk_get(dev, "sclk_vpll");
-        if (IS_ERR_OR_NULL(sclk_vpll)) {
+        if (IS_ERR(sclk_vpll)) {
                 dev_err(dev, "failed to get clock 'sclk_vpll'\n");
-                ret = -ENXIO;
+                ret = PTR_ERR(sclk_vpll);
                 goto fail_dacphy;
         }
         clk_set_parent(sdev->sclk_dac, sclk_vpll);
         clk_put(sclk_vpll);
         sdev->fout_vpll = clk_get(dev, "fout_vpll");
-        if (IS_ERR_OR_NULL(sdev->fout_vpll)) {
+        if (IS_ERR(sdev->fout_vpll)) {
                 dev_err(dev, "failed to get clock 'fout_vpll'\n");
+                ret = PTR_ERR(sdev->fout_vpll);
                 goto fail_dacphy;
         }
         dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll));
 
         /* acquire regulator */
         sdev->vdac = devm_regulator_get(dev, "vdd33a_dac");
-        if (IS_ERR_OR_NULL(sdev->vdac)) {
+        if (IS_ERR(sdev->vdac)) {
                 dev_err(dev, "failed to get regulator 'vdac'\n");
+                ret = PTR_ERR(sdev->vdac);
                 goto fail_fout_vpll;
         }
         sdev->vdet = devm_regulator_get(dev, "vdet");
-        if (IS_ERR_OR_NULL(sdev->vdet)) {
+        if (IS_ERR(sdev->vdet)) {
                 dev_err(dev, "failed to get regulator 'vdet'\n");
+                ret = PTR_ERR(sdev->vdet);
                 goto fail_fout_vpll;
         }
 
@@ -394,7 +397,7 @@ static int sdo_probe(struct platform_device *pdev)
         /* configuration of interface subdevice */
         v4l2_subdev_init(&sdev->sd, &sdo_sd_ops);
         sdev->sd.owner = THIS_MODULE;
-        strlcpy(sdev->sd.name, "s5p-sdo", sizeof sdev->sd.name);
+        strlcpy(sdev->sd.name, "s5p-sdo", sizeof(sdev->sd.name));
 
         /* set default format */
         sdev->fmt = sdo_find_format(SDO_DEFAULT_STD);
diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c
index 49191aac9634..d90d2286090b 100644
--- a/drivers/media/platform/s5p-tv/sii9234_drv.c
+++ b/drivers/media/platform/s5p-tv/sii9234_drv.c
@@ -338,7 +338,7 @@ static int sii9234_probe(struct i2c_client *client,
         }
 
         ctx->gpio_n_reset = pdata->gpio_n_reset;
-        ret = gpio_request(ctx->gpio_n_reset, "MHL_RST");
+        ret = devm_gpio_request(dev, ctx->gpio_n_reset, "MHL_RST");
         if (ret) {
                 dev_err(dev, "failed to acquire MHL_RST gpio\n");
                 return ret;
@@ -370,7 +370,6 @@ fail_pm_get:
 
 fail_pm:
         pm_runtime_disable(dev);
-        gpio_free(ctx->gpio_n_reset);
 
 fail:
         dev_err(dev, "probe failed\n");
@@ -381,11 +380,8 @@ fail:
 static int sii9234_remove(struct i2c_client *client)
 {
         struct device *dev = &client->dev;
-        struct v4l2_subdev *sd = i2c_get_clientdata(client);
-        struct sii9234_context *ctx = sd_to_context(sd);
 
         pm_runtime_disable(dev);
-        gpio_free(ctx->gpio_n_reset);
 
         dev_info(dev, "remove successful\n");