Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0116b8df authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: staging: atomisp: stop duplicating input format types 



The same formats are defined twice with different names,
as warned:

    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58:     int enum atomisp_input_format  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5092:58:     int enum ia_css_stream_format
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50:     int enum atomisp_input_format  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5112:50:     int enum ia_css_stream_format
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42: warning: mixing different enum types
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42:     int enum atomisp_input_format  versus
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:5288:42:     int enum ia_css_stream_format
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62: warning: incorrect type in argument 2 (different address spaces)
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:    expected void const [noderef] <asn:1>*from
    drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:    got unsigned short [usertype] *<noident>

Stop this enum abuse.

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

drivers/staging/media/atomisp/include/linux/atomisp_platform.h

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ enum atomisp_input_format { 
	ATOMISP_INPUT_FORMAT_USER_DEF8,  /* User defined 8-bit data type 8 */

};



#define N_ATOMISP_INPUT_FORMAT (ATOMISP_INPUT_FORMAT_USER_DEF8 + 1)







enum intel_v4l2_subdev_type {

	RAW_CAMERA = 1,

	SOC_CAMERA = 2,

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

+6 −6
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void atomisp_css_isys_set_valid(struct atomisp_sub_device *asd, 


void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,

				 enum atomisp_input_stream_id stream_id,

				 enum atomisp_css_stream_format format,

				 enum atomisp_input_format format,

				 int isys_stream);



int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
@@ -262,18 +262,18 @@ int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd, 


int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format);

				    enum atomisp_input_format input_format);



void atomisp_css_isys_two_stream_cfg_update_stream1(

				    struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format,

				    enum atomisp_input_format input_format,

				    unsigned int width, unsigned int height);



void atomisp_css_isys_two_stream_cfg_update_stream2(

				    struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format,

				    enum atomisp_input_format input_format,

				    unsigned int width, unsigned int height);



int atomisp_css_input_set_resolution(struct atomisp_sub_device *asd,
@@ -290,7 +290,7 @@ void atomisp_css_input_set_bayer_order(struct atomisp_sub_device *asd, 


void atomisp_css_input_set_format(struct atomisp_sub_device *asd,

				enum atomisp_input_stream_id stream_id,

				enum atomisp_css_stream_format format);

				enum atomisp_input_format format);



int atomisp_css_input_set_effective_resolution(

					struct atomisp_sub_device *asd,
@@ -336,7 +336,7 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd, 
				unsigned int num_lanes,

				unsigned int timeout,

				unsigned int mipi_freq,

				enum atomisp_css_stream_format metadata_format,

				enum atomisp_input_format metadata_format,

				unsigned int metadata_width,

				unsigned int metadata_height);

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

+8 −8
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ void atomisp_css_isys_set_valid(struct atomisp_sub_device *asd, 


void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,

				 enum atomisp_input_stream_id stream_id,

				 enum atomisp_css_stream_format format,

				 enum atomisp_input_format format,

				 int isys_stream)

{
@@ -1796,7 +1796,7 @@ void atomisp_css_isys_set_format(struct atomisp_sub_device *asd, 


void atomisp_css_input_set_format(struct atomisp_sub_device *asd,

					enum atomisp_input_stream_id stream_id,

					enum atomisp_css_stream_format format)

					enum atomisp_input_format format)

{



	struct ia_css_stream_config *s_config =
@@ -1835,7 +1835,7 @@ int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd, 


int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format)

				    enum atomisp_input_format input_format)

{

	struct ia_css_stream_config *s_config =

		&asd->stream_env[stream_id].stream_config;
@@ -1849,9 +1849,9 @@ int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd, 
	s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].linked_isys_stream_id

		= IA_CSS_STREAM_ISYS_STREAM_0;

	s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_0].format =

		IA_CSS_STREAM_FORMAT_USER_DEF1;

		ATOMISP_INPUT_FORMAT_USER_DEF1;

	s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].format =

		IA_CSS_STREAM_FORMAT_USER_DEF2;

		ATOMISP_INPUT_FORMAT_USER_DEF2;

	s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].valid = true;

	return 0;

}
@@ -1859,7 +1859,7 @@ int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd, 
void atomisp_css_isys_two_stream_cfg_update_stream1(

				    struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format,

				    enum atomisp_input_format input_format,

				    unsigned int width, unsigned int height)

{

	struct ia_css_stream_config *s_config =
@@ -1877,7 +1877,7 @@ void atomisp_css_isys_two_stream_cfg_update_stream1( 
void atomisp_css_isys_two_stream_cfg_update_stream2(

				    struct atomisp_sub_device *asd,

				    enum atomisp_input_stream_id stream_id,

				    enum atomisp_css_stream_format input_format,

				    enum atomisp_input_format input_format,

				    unsigned int width, unsigned int height)

{

	struct ia_css_stream_config *s_config =
@@ -2122,7 +2122,7 @@ int atomisp_css_input_configure_port( 
		unsigned int num_lanes,

		unsigned int timeout,

		unsigned int mipi_freq,

		enum atomisp_css_stream_format metadata_format,

		enum atomisp_input_format metadata_format,

		unsigned int metadata_width,

		unsigned int metadata_height)

{

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

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define atomisp_css_irq_info  ia_css_irq_info

#define atomisp_css_isp_config ia_css_isp_config

#define atomisp_css_bayer_order ia_css_bayer_order

#define atomisp_css_stream_format ia_css_stream_format

#define atomisp_css_capture_mode ia_css_capture_mode

#define atomisp_css_input_mode ia_css_input_mode

#define atomisp_css_frame ia_css_frame
@@ -117,7 +116,7 @@ 
 */

#define CSS_ID(val)	(IA_ ## val)

#define CSS_EVENT(val)	(IA_CSS_EVENT_TYPE_ ## val)

#define CSS_FORMAT(val)	(IA_CSS_STREAM_FORMAT_ ## val)

#define CSS_FORMAT(val)	(ATOMISP_INPUT_FORMAT_ ## val)



#define CSS_EVENT_PORT_EOF	CSS_EVENT(PORT_EOF)

#define CSS_EVENT_FRAME_TAGGED	CSS_EVENT(FRAME_TAGGED)

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

+7 −7
Original line number Diff line number Diff line
@@ -42,17 +42,17 @@ const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = { 
	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, IA_CSS_STREAM_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, IA_CSS_STREAM_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_JPEG_1X8, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, IA_CSS_STREAM_FORMAT_BINARY_8 },

	{ MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_JPEG_1X8, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },

	{ V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, CSS_FRAME_FORMAT_NV12, 0, CSS_FRAME_FORMAT_NV12 },

	{ V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, CSS_FRAME_FORMAT_NV21, 0, CSS_FRAME_FORMAT_NV21 },

	{ V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY },

	{ V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY },

#if 0

	{ V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, IA_CSS_STREAM_FORMAT_BINARY_8 },

	{ V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },

#endif

	/* no valid V4L2 MBUS code for metadata format, so leave it 0. */

	{ 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, IA_CSS_STREAM_FORMAT_EMBEDDED },

	{ 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, ATOMISP_INPUT_FORMAT_EMBEDDED },

	{}

};
@@ -101,7 +101,7 @@ const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv(u32 code) 
}



const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_by_atomisp_in_fmt(

	enum atomisp_css_stream_format atomisp_in_fmt)

	enum atomisp_input_format atomisp_in_fmt)

{

	int i;