From 1b0a179061890c0a2f6748426f03e8cd2176d3e2 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Wed, 5 Aug 2020 21:31:04 +0800 Subject: [PATCH 15/49] gpu: drm: dridge: hdp-audio: change to mute_stream To cope with upstream API change: e2978c45e5ed ("ASoC: soc-dai: remove .digital_mute") Signed-off-by: Dong Aisheng --- drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c index f4f3f9ca437c..85f526175439 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c @@ -358,8 +358,8 @@ static void audio_shutdown(struct device *dev, void *data) mhdp->audio_info.format = AFMT_UNUSED; } -static int audio_digital_mute(struct device *dev, void *data, - bool enable) +static int audio_mute_stream(struct device *dev, void *data, + bool enable, int direction) { struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev); int ret; @@ -392,9 +392,10 @@ static int audio_hook_plugged_cb(struct device *dev, void *data, static const struct hdmi_codec_ops audio_codec_ops = { .hw_params = audio_hw_params, .audio_shutdown = audio_shutdown, - .digital_mute = audio_digital_mute, + .mute_stream = audio_mute_stream, .get_eld = audio_get_eld, .hook_plugged_cb = audio_hook_plugged_cb, + .no_capture_mute = 1, }; int cdns_mhdp_register_audio_driver(struct device *dev) -- 2.29.2