Merge "video: enum comparison to constant fix" (263b968f) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/video/hdmi.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -699,7 +699,7 @@ static void hdmi_avi_infoframe_log(const char *level,

		static const char *hdmi_spd_sdi_get_name(enum hdmi_spd_sdi sdi)
		{
		if (sdi < 0 \|\| sdi > 0xff)
		if (sdi < 0 \|\| sdi > HDMI_SPD_SDI_MAX)
		return "Invalid";
		switch (sdi) {
		case HDMI_SPD_SDI_UNKNOWN:
		@@ -730,9 +730,10 @@ static const char *hdmi_spd_sdi_get_name(enum hdmi_spd_sdi sdi)
		return "HD DVD";
		case HDMI_SPD_SDI_PMP:
		return "PMP";
		}
		default:
		return "Reserved";
		}
		}

		/**
		* hdmi_spd_infoframe_log() - log info of HDMI SPD infoframe
		@@ -842,7 +843,7 @@ hdmi_audio_sample_frequency_get_name(enum hdmi_audio_sample_frequency freq)
		static const char *
		hdmi_audio_coding_type_ext_get_name(enum hdmi_audio_coding_type_ext ctx)
		{
		if (ctx < 0 \|\| ctx > 0x1f)
		if (ctx < 0 \|\| ctx > HDMI_AUDIO_CODING_TYPE_EXT_MAX)
		return "Invalid";

		switch (ctx) {
		@@ -866,9 +867,10 @@ hdmi_audio_coding_type_ext_get_name(enum hdmi_audio_coding_type_ext ctx)
		return "MPEG-4 HE AAC + MPEG Surround";
		case HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND:
		return "MPEG-4 AAC LC + MPEG Surround";
		}
		default:
		return "Reserved";
		}
		}

		/**
		* hdmi_audio_infoframe_log() - log info of HDMI AUDIO infoframe

+4 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,7 @@ enum hdmi_spd_sdi {
		HDMI_SPD_SDI_SACD,
		HDMI_SPD_SDI_HDDVD,
		HDMI_SPD_SDI_PMP,
		HDMI_SPD_SDI_MAX = 0xff,
		};

		struct hdmi_spd_infoframe {
		@@ -252,6 +253,9 @@ enum hdmi_audio_coding_type_ext {
		HDMI_AUDIO_CODING_TYPE_EXT_DRA,
		HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND,
		HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10,

		/* Maximum reserved value */
		HDMI_AUDIO_CODING_TYPE_EXT_MAX = 0x1f,
		};

		struct hdmi_audio_infoframe {