Skip to content

L
linux
Commit c4ccfe4e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: sh: convert not to use asoc_xxx() 

ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87cyyos25y.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5a95c5b
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
sound/soc/sh/dma-sh7760.c
View file @ c4ccfe4e
...@@ -118,8 +118,8 @@ static void camelot_rxdma(void *data) ...@@ -118,8 +118,8 @@ static void camelot_rxdma(void *data)
static int camelot_pcm_open(struct snd_soc_component *component, static int camelot_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
int ret, dmairq; int ret, dmairq;
...@@ -132,7 +132,7 @@ static int camelot_pcm_open(struct snd_soc_component *component, ...@@ -132,7 +132,7 @@ static int camelot_pcm_open(struct snd_soc_component *component,
ret = dmabrg_request_irq(dmairq, camelot_rxdma, cam); ret = dmabrg_request_irq(dmairq, camelot_rxdma, cam);
if (unlikely(ret)) { if (unlikely(ret)) {
pr_debug("audio unit %d irqs already taken!\n", pr_debug("audio unit %d irqs already taken!\n",
asoc_rtd_to_cpu(rtd, 0)->id); snd_soc_rtd_to_cpu(rtd, 0)->id);
return -EBUSY; return -EBUSY;
} }
(void)dmabrg_request_irq(dmairq + 1,camelot_rxdma, cam); (void)dmabrg_request_irq(dmairq + 1,camelot_rxdma, cam);
...@@ -141,7 +141,7 @@ static int camelot_pcm_open(struct snd_soc_component *component, ...@@ -141,7 +141,7 @@ static int camelot_pcm_open(struct snd_soc_component *component,
ret = dmabrg_request_irq(dmairq, camelot_txdma, cam); ret = dmabrg_request_irq(dmairq, camelot_txdma, cam);
if (unlikely(ret)) { if (unlikely(ret)) {
pr_debug("audio unit %d irqs already taken!\n", pr_debug("audio unit %d irqs already taken!\n",
asoc_rtd_to_cpu(rtd, 0)->id); snd_soc_rtd_to_cpu(rtd, 0)->id);
return -EBUSY; return -EBUSY;
} }
(void)dmabrg_request_irq(dmairq + 1, camelot_txdma, cam); (void)dmabrg_request_irq(dmairq + 1, camelot_txdma, cam);
...@@ -152,8 +152,8 @@ static int camelot_pcm_open(struct snd_soc_component *component, ...@@ -152,8 +152,8 @@ static int camelot_pcm_open(struct snd_soc_component *component,
static int camelot_pcm_close(struct snd_soc_component *component, static int camelot_pcm_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
int dmairq; int dmairq;
...@@ -174,8 +174,8 @@ static int camelot_hw_params(struct snd_soc_component *component, ...@@ -174,8 +174,8 @@ static int camelot_hw_params(struct snd_soc_component *component,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
if (recv) { if (recv) {
...@@ -192,8 +192,8 @@ static int camelot_prepare(struct snd_soc_component *component, ...@@ -192,8 +192,8 @@ static int camelot_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
pr_debug("PCM data: addr 0x%08lx len %d\n", pr_debug("PCM data: addr 0x%08lx len %d\n",
(u32)runtime->dma_addr, runtime->dma_bytes); (u32)runtime->dma_addr, runtime->dma_bytes);
...@@ -240,8 +240,8 @@ static inline void dmabrg_rec_dma_stop(struct camelot_pcm *cam) ...@@ -240,8 +240,8 @@ static inline void dmabrg_rec_dma_stop(struct camelot_pcm *cam)
static int camelot_trigger(struct snd_soc_component *component, static int camelot_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd) struct snd_pcm_substream *substream, int cmd)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
switch (cmd) { switch (cmd) {
...@@ -268,8 +268,8 @@ static snd_pcm_uframes_t camelot_pos(struct snd_soc_component *component, ...@@ -268,8 +268,8 @@ static snd_pcm_uframes_t camelot_pos(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id]; struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1; int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
unsigned long pos; unsigned long pos;
......
sound/soc/sh/fsi.c
View file @ c4ccfe4e
...@@ -406,9 +406,9 @@ static int fsi_is_play(struct snd_pcm_substream *substream) ...@@ -406,9 +406,9 @@ static int fsi_is_play(struct snd_pcm_substream *substream)
static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream) static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
return asoc_rtd_to_cpu(rtd, 0); return snd_soc_rtd_to_cpu(rtd, 0);
} }
static struct fsi_priv *fsi_get_priv_frm_dai(struct snd_soc_dai *dai) static struct fsi_priv *fsi_get_priv_frm_dai(struct snd_soc_dai *dai)
......
sound/soc/sh/migor.c
View file @ c4ccfe4e
...@@ -45,8 +45,8 @@ static struct clk_lookup *siumckb_lookup; ...@@ -45,8 +45,8 @@ static struct clk_lookup *siumckb_lookup;
static int migor_hw_params(struct snd_pcm_substream *substream, static int migor_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
int ret; int ret;
unsigned int rate = params_rate(params); unsigned int rate = params_rate(params);
...@@ -67,7 +67,7 @@ static int migor_hw_params(struct snd_pcm_substream *substream, ...@@ -67,7 +67,7 @@ static int migor_hw_params(struct snd_pcm_substream *substream,
clk_set_rate(&siumckb_clk, codec_freq); clk_set_rate(&siumckb_clk, codec_freq);
dev_dbg(codec_dai->dev, "%s: configure %luHz\n", __func__, codec_freq); dev_dbg(codec_dai->dev, "%s: configure %luHz\n", __func__, codec_freq);
ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), SIU_CLKB_EXT, ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_cpu(rtd, 0), SIU_CLKB_EXT,
codec_freq / 2, SND_SOC_CLOCK_IN); codec_freq / 2, SND_SOC_CLOCK_IN);
if (!ret) if (!ret)
...@@ -78,8 +78,8 @@ static int migor_hw_params(struct snd_pcm_substream *substream, ...@@ -78,8 +78,8 @@ static int migor_hw_params(struct snd_pcm_substream *substream,
static int migor_hw_free(struct snd_pcm_substream *substream) static int migor_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
if (use_count) { if (use_count) {
use_count--; use_count--;
......
sound/soc/sh/rcar/core.c
View file @ c4ccfe4e
...@@ -690,9 +690,9 @@ static void rsnd_dai_stream_quit(struct rsnd_dai_stream *io) ...@@ -690,9 +690,9 @@ static void rsnd_dai_stream_quit(struct rsnd_dai_stream *io)
static static
struct snd_soc_dai *rsnd_substream_to_dai(struct snd_pcm_substream *substream) struct snd_soc_dai *rsnd_substream_to_dai(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
return asoc_rtd_to_cpu(rtd, 0); return snd_soc_rtd_to_cpu(rtd, 0);
} }
static static
...@@ -1574,7 +1574,7 @@ static int rsnd_hw_params(struct snd_soc_component *component, ...@@ -1574,7 +1574,7 @@ static int rsnd_hw_params(struct snd_soc_component *component,
struct snd_soc_dai *dai = rsnd_substream_to_dai(substream); struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);
struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream);
/* /*
* rsnd assumes that it might be used under DPCM if user want to use * rsnd assumes that it might be used under DPCM if user want to use
......
sound/soc/sh/rz-ssi.c
View file @ c4ccfe4e
...@@ -158,9 +158,9 @@ static void rz_ssi_reg_mask_setl(struct rz_ssi_priv *priv, uint reg, ...@@ -158,9 +158,9 @@ static void rz_ssi_reg_mask_setl(struct rz_ssi_priv *priv, uint reg,
static inline struct snd_soc_dai * static inline struct snd_soc_dai *
rz_ssi_get_dai(struct snd_pcm_substream *substream) rz_ssi_get_dai(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
return asoc_rtd_to_cpu(rtd, 0); return snd_soc_rtd_to_cpu(rtd, 0);
} }
static inline bool rz_ssi_stream_is_play(struct rz_ssi_priv *ssi, static inline bool rz_ssi_stream_is_play(struct rz_ssi_priv *ssi,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7