Commit 64be2070 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Rename __get_mipi_port() to atomisp_port_to_mipi_port() 

Rename __get_mipi_port() to atomisp_port_to_mipi_port(), this is not a
private (not static) function so its name should be properly prefixed.

While at is also cleanup the weird handling of ATOMISP_CAMERA_PORT_TERTIARY
this seems to be a left over from when the driver also supported CSI
receivers with only 2 ports, but those are not supported by the current
code base, so this can be cleaned up now.

Link: https://lore.kernel.org/r/20230518153733.195306-5-hdegoede@redhat.com



Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 45b4ab38

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+4 −6
Original line number Diff line number Diff line
@@ -3893,7 +3893,7 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f) 
	return 0;

}



enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,

enum mipi_port_id atomisp_port_to_mipi_port(struct atomisp_device *isp,

					    enum atomisp_camera_port port)

{

	switch (port) {
@@ -3902,9 +3902,7 @@ enum mipi_port_id __get_mipi_port(struct atomisp_device *isp, 
	case ATOMISP_CAMERA_PORT_SECONDARY:

		return MIPI_PORT1_ID;

	case ATOMISP_CAMERA_PORT_TERTIARY:

		if (MIPI_PORT1_ID + 1 != N_MIPI_PORT_ID)

			return MIPI_PORT1_ID + 1;

		fallthrough;

		return MIPI_PORT2_ID;

	default:

		dev_err(isp->dev, "unsupported port: %d\n", port);

		return MIPI_PORT0_ID;
@@ -3980,7 +3978,7 @@ static inline int atomisp_set_sensor_mipi_to_isp( 
		return -EINVAL;

	input_format = fc->atomisp_in_fmt;

	atomisp_css_input_configure_port(asd,

					 __get_mipi_port(asd->isp, mipi_info->port),

					 atomisp_port_to_mipi_port(asd->isp, mipi_info->port),

					 mipi_info->num_lanes,

					 0xffff4, mipi_freq,

					 input_format,

drivers/staging/media/atomisp/pci/atomisp_cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error, 
/* Events. Only one event has to be exported for now. */

void atomisp_eof_event(struct atomisp_sub_device *asd, uint8_t exp_id);



enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,

enum mipi_port_id atomisp_port_to_mipi_port(struct atomisp_device *isp,

					    enum atomisp_camera_port port);



void atomisp_apply_css_parameters(