Commit fd418c8a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: staging: atomisp: stop mixing enum types 



This driver abuses on enum types:

    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37:     int enum ia_css_csi2_port  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37:     int enum mipi_port_ID_t
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39:     int enum ia_css_csi2_port  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39:     int enum mipi_port_ID_t
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62:     int enum mipi_port_ID_t  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62:     int enum ia_css_csi2_port

Doing some "implicit" typecast. Fix it by using just one enum
everywhere, and stopping using typedef to refer to it.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ddbd758f

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

+5 −5
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void atomisp_reset_event(struct atomisp_sub_device *asd) 
}





static void print_csi_rx_errors(enum ia_css_csi2_port port,

static void print_csi_rx_errors(enum mipi_port_id port,

				struct atomisp_device *isp)

{

	u32 infos = 0;
@@ -481,7 +481,7 @@ static void clear_irq_reg(struct atomisp_device *isp) 
}



static struct atomisp_sub_device *

__get_asd_from_port(struct atomisp_device *isp, mipi_port_ID_t port)

__get_asd_from_port(struct atomisp_device *isp, enum mipi_port_id port)

{

	int i;
@@ -570,9 +570,9 @@ irqreturn_t atomisp_isr(int irq, void *dev) 
	    (irq_infos & CSS_IRQ_INFO_IF_ERROR)) {

		/* handle mipi receiver error */

		u32 rx_infos;

		enum ia_css_csi2_port port;

		enum mipi_port_id port;



		for (port = IA_CSS_CSI2_PORT0; port <= IA_CSS_CSI2_PORT2;

		for (port = MIPI_PORT0_ID; port <= MIPI_PORT2_ID;

		     port++) {

			print_csi_rx_errors(port, isp);

			atomisp_css_rx_get_irq_info(port, &rx_infos);
@@ -5028,7 +5028,7 @@ atomisp_try_fmt_file(struct atomisp_device *isp, struct v4l2_format *f) 
	return 0;

}



mipi_port_ID_t __get_mipi_port(struct atomisp_device *isp,

enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,

				enum atomisp_camera_port port)

{

	switch (port) {

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

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ int atomisp_source_pad_to_stream_id(struct atomisp_sub_device *asd, 
 */

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



mipi_port_ID_t __get_mipi_port(struct atomisp_device *isp,

enum mipi_port_id __get_mipi_port(struct atomisp_device *isp,

				enum atomisp_camera_port port);



bool atomisp_is_vf_pipe(struct atomisp_video_pipe *pipe);

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h

+3 −3
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ void atomisp_css_init_struct(struct atomisp_sub_device *asd); 
int atomisp_css_irq_translate(struct atomisp_device *isp,

			      unsigned int *infos);



void atomisp_css_rx_get_irq_info(enum ia_css_csi2_port port,

void atomisp_css_rx_get_irq_info(enum mipi_port_id port,

					unsigned int *infos);



void atomisp_css_rx_clear_irq_info(enum ia_css_csi2_port port,

void atomisp_css_rx_clear_irq_info(enum mipi_port_id port,

					unsigned int infos);



int atomisp_css_irq_enable(struct atomisp_device *isp,
@@ -332,7 +332,7 @@ void atomisp_css_enable_cvf(struct atomisp_sub_device *asd, 
							bool enable);



int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,

				mipi_port_ID_t port,

				enum mipi_port_id port,

				unsigned int num_lanes,

				unsigned int timeout,

				unsigned int mipi_freq,

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c

+3 −3
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ int atomisp_css_irq_translate(struct atomisp_device *isp, 
	return 0;

}



void atomisp_css_rx_get_irq_info(enum ia_css_csi2_port port,

void atomisp_css_rx_get_irq_info(enum mipi_port_id port,

					unsigned int *infos)

{

#ifndef ISP2401_NEW_INPUT_SYSTEM
@@ -1030,7 +1030,7 @@ void atomisp_css_rx_get_irq_info(enum ia_css_csi2_port port, 
#endif

}



void atomisp_css_rx_clear_irq_info(enum ia_css_csi2_port port,

void atomisp_css_rx_clear_irq_info(enum mipi_port_id port,

					unsigned int infos)

{

#ifndef ISP2401_NEW_INPUT_SYSTEM
@@ -2118,7 +2118,7 @@ void atomisp_css_enable_cvf(struct atomisp_sub_device *asd, 


int atomisp_css_input_configure_port(

		struct atomisp_sub_device *asd,

		mipi_port_ID_t port,

		enum mipi_port_id port,

		unsigned int num_lanes,

		unsigned int timeout,

		unsigned int mipi_freq,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h

+2 −2
Original line number Diff line number Diff line
@@ -284,12 +284,12 @@ typedef enum { 
	N_RX_ID

} rx_ID_t;



typedef enum {

enum mipi_port_id {

	MIPI_PORT0_ID = 0,

	MIPI_PORT1_ID,

	MIPI_PORT2_ID,

	N_MIPI_PORT_ID

} mipi_port_ID_t;

};



#define	N_RX_CHANNEL_ID		4

CRA Git | Maintained and supported by SUSTech CRA and CCSE