hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920185145.1912-4-ville.syrjala@linux.intel.com
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
This commit is contained in:
Ville Syrjälä 2018-09-20 21:51:30 +03:00
parent 480b8b3e42
commit 468d6a4996
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/hdmi.c
View File

@ -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, static void hdmi_infoframe_log_header(const char *level,
struct device *dev, 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_log("HDMI infoframe: %s, version %u, length %u\n",
hdmi_infoframe_type_get_name(frame->type), 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, static void hdmi_avi_infoframe_log(const char *level,
struct device *dev, struct device *dev,
struct hdmi_avi_infoframe *frame) const struct hdmi_avi_infoframe *frame)
{ {
hdmi_infoframe_log_header(level, dev, hdmi_infoframe_log_header(level, dev,
(struct hdmi_any_infoframe *)frame); (const struct hdmi_any_infoframe *)frame);
hdmi_log(" colorspace: %s\n", hdmi_log(" colorspace: %s\n",
hdmi_colorspace_get_name(frame->colorspace)); 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, static void hdmi_spd_infoframe_log(const char *level,
struct device *dev, struct device *dev,
struct hdmi_spd_infoframe *frame) const struct hdmi_spd_infoframe *frame)
{ {
u8 buf[17]; u8 buf[17];
hdmi_infoframe_log_header(level, dev, hdmi_infoframe_log_header(level, dev,
(struct hdmi_any_infoframe *)frame); (const struct hdmi_any_infoframe *)frame);
memset(buf, 0, sizeof(buf)); 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, static void hdmi_audio_infoframe_log(const char *level,
struct device *dev, struct device *dev,
struct hdmi_audio_infoframe *frame) const struct hdmi_audio_infoframe *frame)
{ {
hdmi_infoframe_log_header(level, dev, hdmi_infoframe_log_header(level, dev,
(struct hdmi_any_infoframe *)frame); (const struct hdmi_any_infoframe *)frame);
if (frame->channels) if (frame->channels)
hdmi_log(" channels: %u\n", frame->channels - 1); 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 static void
hdmi_vendor_any_infoframe_log(const char *level, hdmi_vendor_any_infoframe_log(const char *level,
struct device *dev, 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, hdmi_infoframe_log_header(level, dev,
(struct hdmi_any_infoframe *)frame); (const struct hdmi_any_infoframe *)frame);
if (frame->any.oui != HDMI_IEEE_OUI) { if (frame->any.oui != HDMI_IEEE_OUI) {
hdmi_log(" not a HDMI vendor infoframe\n"); 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, void hdmi_infoframe_log(const char *level,
struct device *dev, struct device *dev,
union hdmi_infoframe *frame) const union hdmi_infoframe *frame)
{ {
switch (frame->any.type) { switch (frame->any.type) {
case HDMI_INFOFRAME_TYPE_AVI: case HDMI_INFOFRAME_TYPE_AVI:

2
include/linux/hdmi.h
View File

@ -335,6 +335,6 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size);
int hdmi_infoframe_unpack(union hdmi_infoframe *frame, int hdmi_infoframe_unpack(union hdmi_infoframe *frame,
const void *buffer, size_t size); const void *buffer, size_t size);
void hdmi_infoframe_log(const char *level, struct device *dev, void hdmi_infoframe_log(const char *level, struct device *dev,
union hdmi_infoframe *frame); const union hdmi_infoframe *frame);
#endif /* _DRM_HDMI_H */ #endif /* _DRM_HDMI_H */