Unverified Commit dec61e16 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Mark Brown
Browse files

ASoC: renesas: rz-ssi: Remove the rz_ssi_get_dai() function 



Remove the rz_ssi_get_dai() function and use directly the
snd_soc_rtd_to_cpu() where needed or the struct device pointer embedded
in the struct rz_ssi_priv objects.

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20241210170953.2936724-9-claudiu.beznea.uj@bp.renesas.com


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

sound/soc/renesas/rz-ssi.c

+5 −12
Original line number Diff line number Diff line
@@ -162,14 +162,6 @@ static void rz_ssi_reg_mask_setl(struct rz_ssi_priv *priv, uint reg, 
	writel(val, (priv->base + reg));

}



static inline struct snd_soc_dai *

rz_ssi_get_dai(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);



	return snd_soc_rtd_to_cpu(rtd, 0);

}



static inline bool rz_ssi_stream_is_play(struct rz_ssi_priv *ssi,

					 struct snd_pcm_substream *substream)

{
@@ -243,15 +235,15 @@ static void rz_ssi_stream_init(struct rz_ssi_stream *strm, 
static void rz_ssi_stream_quit(struct rz_ssi_priv *ssi,

			       struct rz_ssi_stream *strm)

{

	struct snd_soc_dai *dai = rz_ssi_get_dai(strm->substream);

	struct device *dev = ssi->dev;



	rz_ssi_set_substream(strm, NULL);



	if (strm->oerr_num > 0)

		dev_info(dai->dev, "overrun = %d\n", strm->oerr_num);

		dev_info(dev, "overrun = %d\n", strm->oerr_num);



	if (strm->uerr_num > 0)

		dev_info(dai->dev, "underrun = %d\n", strm->uerr_num);

		dev_info(dev, "underrun = %d\n", strm->uerr_num);

}



static int rz_ssi_clk_setup(struct rz_ssi_priv *ssi, unsigned int rate,
@@ -988,7 +980,8 @@ static int rz_ssi_pcm_open(struct snd_soc_component *component, 
static snd_pcm_uframes_t rz_ssi_pcm_pointer(struct snd_soc_component *component,

					    struct snd_pcm_substream *substream)

{

	struct snd_soc_dai *dai = rz_ssi_get_dai(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct rz_ssi_priv *ssi = snd_soc_dai_get_drvdata(dai);

	struct rz_ssi_stream *strm = rz_ssi_stream_get(ssi, substream);