From 31e0ac720b3a485f571b66c70e1dbb877586a635 Mon Sep 17 00:00:00 2001 From: Yakir Yang Date: Sat, 16 Jul 2016 16:46:50 +0800 Subject: [PATCH] drm/rockchip: inno_hdmi: add the missing parameter in struct hdmi_codec_ops Commit b360d3748e ("ASoC: hdmi-codec: callback function will be called with private data") have introduced an external parameter in struct hdmi_codec_ops, so need to fix the old interfaces. Change-Id: Iaebd49ba7eb7fc0d857ff8aa8f9af39ea4678143 Signed-off-by: Yakir Yang --- drivers/gpu/drm/rockchip/inno_hdmi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index c31dc075c319..c296559ba796 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -747,7 +747,7 @@ int inno_hdmi_audio_config_set(struct inno_hdmi *hdmi, struct audio_info *audio) return inno_hdmi_config_audio_aai(hdmi, audio); } -static int inno_hdmi_audio_hw_params(struct device *dev, +static int inno_hdmi_audio_hw_params(struct device *dev, void *d, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { @@ -777,12 +777,12 @@ static int inno_hdmi_audio_hw_params(struct device *dev, return inno_hdmi_audio_config_set(hdmi, &audio); } -static void inno_hdmi_audio_shutdown(struct device *dev) +static void inno_hdmi_audio_shutdown(struct device *dev, void *d) { /* do nothing */ } -static int inno_hdmi_audio_digital_mute(struct device *dev, bool mute) +static int inno_hdmi_audio_digital_mute(struct device *dev, void *d, bool mute) { struct inno_hdmi *hdmi = dev_get_drvdata(dev); @@ -803,7 +803,8 @@ static int inno_hdmi_audio_digital_mute(struct device *dev, bool mute) return 0; } -static int inno_hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) +static int inno_hdmi_audio_get_eld(struct device *dev, void *d, + uint8_t *buf, size_t len) { struct inno_hdmi *hdmi = dev_get_drvdata(dev); struct drm_mode_config *config = &hdmi->encoder.dev->mode_config; -- 2.34.1