media: ccs: Switch to init_cfg

Use init_cfg() instead of manually setting up defaults in file handle
open.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index fb823c5c3dd31dc2b2cce3902b4f8a3c8eded5e9..9e87696037047f74915abd9cf44f6290a82ffce0 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -2945,7 +2945,6 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
 }
 
 static const struct v4l2_subdev_ops ccs_ops;
-static const struct v4l2_subdev_internal_ops ccs_internal_ops;
 static const struct media_entity_operations ccs_entity_ops;
 
 static int ccs_register_subdev(struct ccs_sensor *sensor,
@@ -3076,13 +3075,13 @@ static void ccs_create_subdev(struct ccs_sensor *sensor,
        if (ssd == sensor->src)
                return;
 
-       ssd->sd.internal_ops = &ccs_internal_ops;
        ssd->sd.owner = THIS_MODULE;
        ssd->sd.dev = &client->dev;
        v4l2_set_subdevdata(&ssd->sd, client);
 }
 
-static int ccs_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+static int ccs_init_cfg(struct v4l2_subdev *sd,
+                       struct v4l2_subdev_state *sd_state)
 {
        struct ccs_subdev *ssd = to_ccs_subdev(sd);
        struct ccs_sensor *sensor = ssd->sensor;
@@ -3092,9 +3091,9 @@ static int ccs_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        for (i = 0; i < ssd->npads; i++) {
                struct v4l2_mbus_framefmt *try_fmt =
-                       v4l2_subdev_get_try_format(sd, fh->state, i);
+                       v4l2_subdev_get_try_format(sd, sd_state, i);
                struct v4l2_rect *try_crop =
-                       v4l2_subdev_get_try_crop(sd, fh->state, i);
+                       v4l2_subdev_get_try_crop(sd, sd_state, i);
                struct v4l2_rect *try_comp;
 
                ccs_get_native_size(ssd, try_crop);
@@ -3107,7 +3106,7 @@ static int ccs_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
                if (ssd == sensor->pixel_array)
                        continue;
 
-               try_comp = v4l2_subdev_get_try_compose(sd, fh->state, i);
+               try_comp = v4l2_subdev_get_try_compose(sd, sd_state, i);
                *try_comp = *try_crop;
        }
 
@@ -3123,6 +3122,7 @@ static const struct v4l2_subdev_video_ops ccs_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops ccs_pad_ops = {
+       .init_cfg = ccs_init_cfg,
        .enum_mbus_code = ccs_enum_mbus_code,
        .get_fmt = ccs_get_format,
        .set_fmt = ccs_set_format,
@@ -3148,11 +3148,6 @@ static const struct media_entity_operations ccs_entity_ops = {
 static const struct v4l2_subdev_internal_ops ccs_internal_src_ops = {
        .registered = ccs_registered,
        .unregistered = ccs_unregistered,
-       .open = ccs_open,
-};
-
-static const struct v4l2_subdev_internal_ops ccs_internal_ops = {
-       .open = ccs_open,
 };
 
 /* -----------------------------------------------------------------------------