Commit 468d6a49 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

video/hdmi: Constify infoframe passed to the log functions 



The log functions don't modify the passed in infoframe so make it const.

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: linux-media@vger.kernel.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920185145.1912-4-ville.syrjala@linux.intel.com


Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
parent 480b8b3e

drivers/video/hdmi.c

+11 −11
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type) 


static void hdmi_infoframe_log_header(const char *level,

				      struct device *dev,

				      struct hdmi_any_infoframe *frame)

				      const struct hdmi_any_infoframe *frame)

{

	hdmi_log("HDMI infoframe: %s, version %u, length %u\n",

		hdmi_infoframe_type_get_name(frame->type),
@@ -673,10 +673,10 @@ hdmi_content_type_get_name(enum hdmi_content_type content_type) 
 */

static void hdmi_avi_infoframe_log(const char *level,

				   struct device *dev,

				   struct hdmi_avi_infoframe *frame)

				   const struct hdmi_avi_infoframe *frame)

{

	hdmi_infoframe_log_header(level, dev,

				  (struct hdmi_any_infoframe *)frame);

				  (const struct hdmi_any_infoframe *)frame);



	hdmi_log("    colorspace: %s\n",

			hdmi_colorspace_get_name(frame->colorspace));
@@ -750,12 +750,12 @@ static const char *hdmi_spd_sdi_get_name(enum hdmi_spd_sdi sdi) 
 */

static void hdmi_spd_infoframe_log(const char *level,

				   struct device *dev,

				   struct hdmi_spd_infoframe *frame)

				   const struct hdmi_spd_infoframe *frame)

{

	u8 buf[17];



	hdmi_infoframe_log_header(level, dev,

				  (struct hdmi_any_infoframe *)frame);

				  (const struct hdmi_any_infoframe *)frame);



	memset(buf, 0, sizeof(buf));
@@ -886,10 +886,10 @@ hdmi_audio_coding_type_ext_get_name(enum hdmi_audio_coding_type_ext ctx) 
 */

static void hdmi_audio_infoframe_log(const char *level,

				     struct device *dev,

				     struct hdmi_audio_infoframe *frame)

				     const struct hdmi_audio_infoframe *frame)

{

	hdmi_infoframe_log_header(level, dev,

				  (struct hdmi_any_infoframe *)frame);

				  (const struct hdmi_any_infoframe *)frame);



	if (frame->channels)

		hdmi_log("    channels: %u\n", frame->channels - 1);
@@ -949,12 +949,12 @@ hdmi_3d_structure_get_name(enum hdmi_3d_structure s3d_struct) 
static void

hdmi_vendor_any_infoframe_log(const char *level,

			      struct device *dev,

			      union hdmi_vendor_any_infoframe *frame)

			      const union hdmi_vendor_any_infoframe *frame)

{

	struct hdmi_vendor_infoframe *hvf = &frame->hdmi;

	const struct hdmi_vendor_infoframe *hvf = &frame->hdmi;



	hdmi_infoframe_log_header(level, dev,

				  (struct hdmi_any_infoframe *)frame);

				  (const struct hdmi_any_infoframe *)frame);



	if (frame->any.oui != HDMI_IEEE_OUI) {

		hdmi_log("    not a HDMI vendor infoframe\n");
@@ -984,7 +984,7 @@ hdmi_vendor_any_infoframe_log(const char *level, 
 */

void hdmi_infoframe_log(const char *level,

			struct device *dev,

			union hdmi_infoframe *frame)

			const union hdmi_infoframe *frame)

{

	switch (frame->any.type) {

	case HDMI_INFOFRAME_TYPE_AVI:

include/linux/hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -335,6 +335,6 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size); 
int hdmi_infoframe_unpack(union hdmi_infoframe *frame,

			  const void *buffer, size_t size);

void hdmi_infoframe_log(const char *level, struct device *dev,

			union hdmi_infoframe *frame);

			const union hdmi_infoframe *frame);



#endif /* _DRM_HDMI_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE