Move the function so that it can call rcsi2_get_active_lanes() in the
following patch.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@xxxxxxxxxxxxxxxx>
---
drivers/media/platform/renesas/rcar-csi2.c | 62 +++++++++++++++---------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 92697ea3df01..8de0f88aca61 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -951,37 +951,6 @@ static int rcsi2_set_phypll(struct rcar_csi2 *priv, unsigned int mbps)
return 0;
}
-static int rcsi2_calc_mbps(struct rcar_csi2 *priv, unsigned int bpp,
- unsigned int lanes)
-{
- struct v4l2_subdev *source;
- s64 freq;
- u64 mbps;
-
- if (!priv->remote)
- return -ENODEV;
-
- source = priv->remote;
-
- freq = v4l2_get_link_freq(source->ctrl_handler, bpp, 2 * lanes);
- if (freq < 0) {
- int ret = (int)freq;
-
- dev_err(priv->dev, "failed to get link freq for %s: %d\n",
- source->name, ret);
-
- return ret;
- }
-
- mbps = div_u64(freq * 2, MEGA);
-
- /* Adjust for C-PHY, divide by 2.8. */
- if (priv->cphy)
- mbps = div_u64(mbps * 5, 14);
-
- return mbps;
-}
-
static int rcsi2_get_active_lanes(struct rcar_csi2 *priv,
unsigned int *lanes)
{
@@ -1029,6 +998,37 @@ static int rcsi2_get_active_lanes(struct rcar_csi2 *priv,
return 0;
}
+static int rcsi2_calc_mbps(struct rcar_csi2 *priv, unsigned int bpp,
+ unsigned int lanes)
+{
+ struct v4l2_subdev *source;
+ s64 freq;
+ u64 mbps;
+
+ if (!priv->remote)
+ return -ENODEV;
+
+ source = priv->remote;
+
+ freq = v4l2_get_link_freq(source->ctrl_handler, bpp, 2 * lanes);
+ if (freq < 0) {
+ int ret = (int)freq;
+
+ dev_err(priv->dev, "failed to get link freq for %s: %d\n",
+ source->name, ret);
+
+ return ret;
+ }
+
+ mbps = div_u64(freq * 2, MEGA);
+
+ /* Adjust for C-PHY, divide by 2.8. */
+ if (priv->cphy)
+ mbps = div_u64(mbps * 5, 14);
+
+ return mbps;
+}
+
static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
struct v4l2_subdev_state *state)
{
--
2.43.0
