[PATCH v2 5/5] media: i2c: imx415: Cluster horizontal and vertical flip controls

[Alexander Shiyan <eagle.alexander923@gmail.com>]

Wrap the hflip and vflip control pointers in an anonymous struct
and add a v4l2_ctrl_cluster(2, &sensor->hflip) call.
Clustering ensures that both controls are handled together by the
control framework, which is appropriate because changing one flip
setting does not invalidate the other, but they may need to be
applied atomically. This also prevents potential inconsistencies
when the control handler updates them.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 drivers/media/i2c/imx415.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c
index ec0239ccf5fc..d72d2cd2fd6d 100644
--- a/drivers/media/i2c/imx415.c
+++ b/drivers/media/i2c/imx415.c
@@ -668,8 +668,10 @@ struct imx415 {
 	struct v4l2_ctrl_handler ctrls;
 	struct v4l2_ctrl *vblank;
 	struct v4l2_ctrl *hblank;
-	struct v4l2_ctrl *hflip;
-	struct v4l2_ctrl *vflip;
+	struct {
+		struct v4l2_ctrl *hflip;
+		struct v4l2_ctrl *vflip;
+	};
 	struct v4l2_ctrl *exposure;
 
 	unsigned int cur_mode;
@@ -949,6 +951,7 @@ static int imx415_ctrls_init(struct imx415 *sensor)
 					  V4L2_CID_HFLIP, 0, 1, 1, 0);
 	sensor->vflip = v4l2_ctrl_new_std(&sensor->ctrls, &imx415_ctrl_ops,
 					  V4L2_CID_VFLIP, 0, 1, 1, 0);
+	v4l2_ctrl_cluster(2, &sensor->hflip);
 
 	v4l2_ctrl_new_std_menu_items(&sensor->ctrls, &imx415_ctrl_ops,
 				     V4L2_CID_TEST_PATTERN,
-- 
2.52.0