Commit 5ee0caf1 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

video: hdmi: Change return type of hdmi_avi_infoframe_init() to void

The hdmi_avi_infoframe_init() never needs to return an error, change its
return type to void.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-2-laurent.pinchart@ideasonboard.com
parent 506629c8
...@@ -5449,14 +5449,11 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, ...@@ -5449,14 +5449,11 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
{ {
enum hdmi_picture_aspect picture_aspect; enum hdmi_picture_aspect picture_aspect;
u8 vic, hdmi_vic; u8 vic, hdmi_vic;
int err;
if (!frame || !mode) if (!frame || !mode)
return -EINVAL; return -EINVAL;
err = hdmi_avi_infoframe_init(frame); hdmi_avi_infoframe_init(frame);
if (err < 0)
return err;
if (mode->flags & DRM_MODE_FLAG_DBLCLK) if (mode->flags & DRM_MODE_FLAG_DBLCLK)
frame->pixel_repeat = 1; frame->pixel_repeat = 1;
......
...@@ -53,18 +53,14 @@ static void hdmi_infoframe_set_checksum(void *buffer, size_t size) ...@@ -53,18 +53,14 @@ static void hdmi_infoframe_set_checksum(void *buffer, size_t size)
/** /**
* hdmi_avi_infoframe_init() - initialize an HDMI AVI infoframe * hdmi_avi_infoframe_init() - initialize an HDMI AVI infoframe
* @frame: HDMI AVI infoframe * @frame: HDMI AVI infoframe
*
* Returns 0 on success or a negative error code on failure.
*/ */
int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame) void hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame)
{ {
memset(frame, 0, sizeof(*frame)); memset(frame, 0, sizeof(*frame));
frame->type = HDMI_INFOFRAME_TYPE_AVI; frame->type = HDMI_INFOFRAME_TYPE_AVI;
frame->version = 2; frame->version = 2;
frame->length = HDMI_AVI_INFOFRAME_SIZE; frame->length = HDMI_AVI_INFOFRAME_SIZE;
return 0;
} }
EXPORT_SYMBOL(hdmi_avi_infoframe_init); EXPORT_SYMBOL(hdmi_avi_infoframe_init);
...@@ -1553,7 +1549,6 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, ...@@ -1553,7 +1549,6 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame,
const void *buffer, size_t size) const void *buffer, size_t size)
{ {
const u8 *ptr = buffer; const u8 *ptr = buffer;
int ret;
if (size < HDMI_INFOFRAME_SIZE(AVI)) if (size < HDMI_INFOFRAME_SIZE(AVI))
return -EINVAL; return -EINVAL;
...@@ -1566,9 +1561,7 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, ...@@ -1566,9 +1561,7 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame,
if (hdmi_infoframe_checksum(buffer, HDMI_INFOFRAME_SIZE(AVI)) != 0) if (hdmi_infoframe_checksum(buffer, HDMI_INFOFRAME_SIZE(AVI)) != 0)
return -EINVAL; return -EINVAL;
ret = hdmi_avi_infoframe_init(frame); hdmi_avi_infoframe_init(frame);
if (ret)
return ret;
ptr += HDMI_INFOFRAME_HEADER_SIZE; ptr += HDMI_INFOFRAME_HEADER_SIZE;
......
...@@ -207,7 +207,7 @@ struct hdmi_drm_infoframe { ...@@ -207,7 +207,7 @@ struct hdmi_drm_infoframe {
u16 max_fall; u16 max_fall;
}; };
int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame); void hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame);
ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer, ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
size_t size); size_t size);
ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame, ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment