[PATCH 1/4] media: ov2640: add VIDEO_V4L2_SUBDEV_API dependency

[Akinobu Mita]

This driver currently supports MC and V4L2 sub-device uAPI, so add
related dependency and remove unneeded ifdefs.

Just adding VIDEO_V4L2_SUBDEV_API dependency is enough, because
VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER.

Cc: Sakari Ailus <sakari.ai...@linux.intel.com>
Cc: Mauro Carvalho Chehab <mche...@kernel.org>
Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
---
 drivers/media/i2c/Kconfig  |  2 +-
 drivers/media/i2c/ov2640.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index be8166d..12d7e52 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -652,7 +652,7 @@ config VIDEO_IMX355
 
 config VIDEO_OV2640
        tristate "OmniVision OV2640 sensor support"
-       depends on VIDEO_V4L2 && I2C
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on MEDIA_CAMERA_SUPPORT
        help
          This is a Video4Linux2 sensor driver for the OmniVision
diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index 83031cf..22782e62 100644
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -298,9 +298,7 @@ struct ov2640_win_size {
 
 struct ov2640_priv {
        struct v4l2_subdev              subdev;
-#if defined(CONFIG_MEDIA_CONTROLLER)
        struct media_pad pad;
-#endif
        struct v4l2_ctrl_handler        hdl;
        u32     cfmt_code;
        struct clk                      *clk;
@@ -927,13 +925,9 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
                mf = v4l2_subdev_get_try_format(sd, cfg, 0);
                format->format = *mf;
                return 0;
-#else
-               return -ENOTTY;
-#endif
        }
 
        mf->width       = priv->win->width;
@@ -1010,7 +1004,6 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
 static int ov2640_init_cfg(struct v4l2_subdev *sd,
                           struct v4l2_subdev_pad_config *cfg)
 {
-#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
        struct v4l2_mbus_framefmt *try_fmt =
                v4l2_subdev_get_try_format(sd, cfg, 0);
        const struct ov2640_win_size *win =
@@ -1024,7 +1017,7 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd,
        try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
        try_fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
        try_fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
-#endif
+
        return 0;
 }
 
@@ -1245,13 +1238,12 @@ static int ov2640_probe(struct i2c_client *client,
                ret = priv->hdl.error;
                goto err_hdl;
        }
-#if defined(CONFIG_MEDIA_CONTROLLER)
+
        priv->pad.flags = MEDIA_PAD_FL_SOURCE;
        priv->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR;
        ret = media_entity_pads_init(&priv->subdev.entity, 1, &priv->pad);
        if (ret < 0)
                goto err_hdl;
-#endif
 
        ret = ov2640_video_probe(client);
        if (ret < 0)
-- 
2.7.4