media: i2c: imx290: Access link_freq_index directly

The imx290_get_link_freq_index() function hides the fact that it relies
on the imx290 current_mode field, which obfuscates the code instead of
making it more readable. Inline it in the callers, and use the mode
pointer we already have in imx290_ctrl_update() instead of using the
current_mode field.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
index 991e7285c40ce34bf737091ccdd3cf7a323c1c6d..4ad6eab4f2e22d99b218735302d5de66d8c0aac1 100644 (file)
--- a/drivers/media/i2c/imx290.c
+++ b/drivers/media/i2c/imx290.c
@@ -547,14 +547,9 @@ static int imx290_write_current_format(struct imx290 *imx290)
        return 0;
 }
 
-static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
-{
-       return imx290->current_mode->link_freq_index;
-}
-
 static s64 imx290_get_link_freq(struct imx290 *imx290)
 {
-       u8 index = imx290_get_link_freq_index(imx290);
+       u8 index = imx290->current_mode->link_freq_index;
 
        return *(imx290_link_freqs_ptr(imx290) + index);
 }
@@ -652,8 +647,7 @@ static void imx290_ctrl_update(struct imx290 *imx290,
        if (!imx290->ctrls.lock)
                return;
 
-       __v4l2_ctrl_s_ctrl(imx290->link_freq,
-                          imx290_get_link_freq_index(imx290));
+       __v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
        __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
                                 imx290_calc_pixel_rate(imx290));