Unverified Commit d789710f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: hdmi-codec: merge .digital_mute() into .mute_stream() 



snd_soc_dai_digital_mute() is internally using both
mute_stream() (1) or digital_mute() (2), but the difference between
these 2 are only handling direction.
We can merge digital_mute() into mute_stream

	int snd_soc_dai_digital_mute(xxx, int direction)
	{
		...
		else if (dai->driver->ops->mute_stream)
(1)			return dai->driver->ops->mute_stream(xxx, direction);
		else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
			 dai->driver->ops->digital_mute)
(2)			return dai->driver->ops->digital_mute(xxx);
		...
	}

For hdmi-codec, we need to update struct hdmi_codec_ops,
and all its users in the same time.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87d055xxj2.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 350d9935

drivers/gpu/drm/bridge/sii902x.c

+4 −3
Original line number Diff line number Diff line
@@ -672,8 +672,8 @@ static void sii902x_audio_shutdown(struct device *dev, void *data) 
	clk_disable_unprepare(sii902x->audio.mclk);

}



static int sii902x_audio_digital_mute(struct device *dev,

				      void *data, bool enable)

static int sii902x_audio_mute(struct device *dev, void *data,

			      bool enable, int direction)

{

	struct sii902x *sii902x = dev_get_drvdata(dev);
@@ -724,9 +724,10 @@ static int sii902x_audio_get_dai_id(struct snd_soc_component *component, 
static const struct hdmi_codec_ops sii902x_audio_codec_ops = {

	.hw_params = sii902x_audio_hw_params,

	.audio_shutdown = sii902x_audio_shutdown,

	.digital_mute = sii902x_audio_digital_mute,

	.mute_stream = sii902x_audio_mute,

	.get_eld = sii902x_audio_get_eld,

	.get_dai_id = sii902x_audio_get_dai_id,

	.no_capture_mute = 1,

};



static int sii902x_audio_codec_init(struct sii902x *sii902x,

drivers/gpu/drm/exynos/exynos_hdmi.c

+4 −2
Original line number Diff line number Diff line
@@ -1604,7 +1604,8 @@ static int hdmi_audio_hw_params(struct device *dev, void *data, 
	return 0;

}



static int hdmi_audio_digital_mute(struct device *dev, void *data, bool mute)

static int hdmi_audio_mute(struct device *dev, void *data,

			   bool mute, int direction)

{

	struct hdmi_context *hdata = dev_get_drvdata(dev);
@@ -1634,8 +1635,9 @@ static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = hdmi_audio_hw_params,

	.audio_shutdown = hdmi_audio_shutdown,

	.digital_mute = hdmi_audio_digital_mute,

	.mute_stream = hdmi_audio_mute,

	.get_eld = hdmi_audio_get_eld,

	.no_capture_mute = 1,

};



static int hdmi_register_audio_device(struct hdmi_context *hdata)

drivers/gpu/drm/i2c/tda998x_drv.c

+4 −3
Original line number Diff line number Diff line
@@ -1133,8 +1133,8 @@ static void tda998x_audio_shutdown(struct device *dev, void *data) 
	mutex_unlock(&priv->audio_mutex);

}



static int tda998x_audio_digital_mute(struct device *dev, void *data,

				      bool enable)

static int tda998x_audio_mute_stream(struct device *dev, void *data,

				     bool enable, int direction)

{

	struct tda998x_priv *priv = dev_get_drvdata(dev);
@@ -1162,8 +1162,9 @@ static int tda998x_audio_get_eld(struct device *dev, void *data, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = tda998x_audio_hw_params,

	.audio_shutdown = tda998x_audio_shutdown,

	.digital_mute = tda998x_audio_digital_mute,

	.mute_stream = tda998x_audio_mute_stream,

	.get_eld = tda998x_audio_get_eld,

	.no_capture_mute = 1,

};



static int tda998x_audio_codec_init(struct tda998x_priv *priv,

drivers/gpu/drm/mediatek/mtk_hdmi.c

+4 −2
Original line number Diff line number Diff line
@@ -1647,7 +1647,8 @@ static void mtk_hdmi_audio_shutdown(struct device *dev, void *data) 
}



static int

mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)

mtk_hdmi_audio_mute(struct device *dev, void *data,

		    bool enable, int direction)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1692,9 +1693,10 @@ static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = { 
	.hw_params = mtk_hdmi_audio_hw_params,

	.audio_startup = mtk_hdmi_audio_startup,

	.audio_shutdown = mtk_hdmi_audio_shutdown,

	.digital_mute = mtk_hdmi_audio_digital_mute,

	.mute_stream = mtk_hdmi_audio_mute,

	.get_eld = mtk_hdmi_audio_get_eld,

	.hook_plugged_cb = mtk_hdmi_audio_hook_plugged_cb,

	.no_capture_mute = 1,

};



static int mtk_hdmi_register_audio_driver(struct device *dev)

drivers/gpu/drm/rockchip/cdn-dp-core.c

+4 −3
Original line number Diff line number Diff line
@@ -817,8 +817,8 @@ out: 
	mutex_unlock(&dp->lock);

}



static int cdn_dp_audio_digital_mute(struct device *dev, void *data,

				     bool enable)

static int cdn_dp_audio_mute_stream(struct device *dev, void *data,

				    bool enable, int direction)

{

	struct cdn_dp_device *dp = dev_get_drvdata(dev);

	int ret;
@@ -849,8 +849,9 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = cdn_dp_audio_hw_params,

	.audio_shutdown = cdn_dp_audio_shutdown,

	.digital_mute = cdn_dp_audio_digital_mute,

	.mute_stream = cdn_dp_audio_mute_stream,

	.get_eld = cdn_dp_audio_get_eld,

	.no_capture_mute = 1,

};



static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE