Commit c5045943 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: rkisp1: csi: Pass sensor pointer to rkisp1_csi_config() 



To prepare for the removal of the active_sensor field from the
rkisp1_device structure, pass the sensor pointer to the
rkisp1_csi_config() function instead of accessing it through
active_sensor.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent a81138af

drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c

+4 −3
Original line number Diff line number Diff line
@@ -19,11 +19,12 @@ 
#include "rkisp1-common.h"

#include "rkisp1-csi.h"



static int rkisp1_csi_config(struct rkisp1_csi *csi)

static int rkisp1_csi_config(struct rkisp1_csi *csi,

			     struct rkisp1_sensor_async *sensor)

{

	struct rkisp1_device *rkisp1 = csi->rkisp1;

	const struct rkisp1_mbus_info *sink_fmt = rkisp1->isp.sink_fmt;

	unsigned int lanes = rkisp1->active_sensor->lanes;

	unsigned int lanes = sensor->lanes;

	u32 mipi_ctrl;



	if (lanes < 1 || lanes > 4)
@@ -103,7 +104,7 @@ int rkisp1_csi_start(struct rkisp1_csi *csi, 
	s64 pixel_clock;

	int ret;



	ret = rkisp1_csi_config(csi);

	ret = rkisp1_csi_config(csi, sensor);

	if (ret)

		return ret;