mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
ASoC: qcom: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/87imivir5q.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
8d8fef280c
commit
6e3a98bcc8
7 changed files with 20 additions and 20 deletions
|
@ -33,7 +33,7 @@ struct apq8016_sbc_data {
|
||||||
|
|
||||||
static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
|
static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct snd_soc_dai *codec_dai;
|
struct snd_soc_dai *codec_dai;
|
||||||
struct snd_soc_component *component;
|
struct snd_soc_component *component;
|
||||||
struct snd_soc_card *card = rtd->card;
|
struct snd_soc_card *card = rtd->card;
|
||||||
|
|
|
@ -31,8 +31,8 @@ static int msm_snd_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 = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
|
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
|
||||||
u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
|
u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -66,7 +66,7 @@ static struct snd_soc_ops apq8096_ops = {
|
||||||
|
|
||||||
static int apq8096_init(struct snd_soc_pcm_runtime *rtd)
|
static int apq8096_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Codec SLIMBUS configuration
|
* Codec SLIMBUS configuration
|
||||||
|
|
|
@ -55,7 +55,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,
|
||||||
{
|
{
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
|
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
|
||||||
struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
|
||||||
struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);
|
struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);
|
||||||
struct lpass_variant *v = drvdata->variant;
|
struct lpass_variant *v = drvdata->variant;
|
||||||
int ret, dma_ch, dir = substream->stream;
|
int ret, dma_ch, dir = substream->stream;
|
||||||
|
|
|
@ -333,7 +333,7 @@ static int q6asm_dai_open(struct snd_soc_component *component,
|
||||||
{
|
{
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;
|
struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;
|
||||||
struct snd_soc_dai *cpu_dai = soc_prtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_prtd, 0);
|
||||||
struct q6asm_dai_rtd *prtd;
|
struct q6asm_dai_rtd *prtd;
|
||||||
struct q6asm_dai_data *pdata;
|
struct q6asm_dai_data *pdata;
|
||||||
struct device *dev = component->dev;
|
struct device *dev = component->dev;
|
||||||
|
@ -545,7 +545,7 @@ static int q6asm_dai_compr_open(struct snd_compr_stream *stream)
|
||||||
struct snd_soc_pcm_runtime *rtd = stream->private_data;
|
struct snd_soc_pcm_runtime *rtd = stream->private_data;
|
||||||
struct snd_soc_component *c = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
|
struct snd_soc_component *c = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
|
||||||
struct snd_compr_runtime *runtime = stream->runtime;
|
struct snd_compr_runtime *runtime = stream->runtime;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct q6asm_dai_data *pdata;
|
struct q6asm_dai_data *pdata;
|
||||||
struct device *dev = c->dev;
|
struct device *dev = c->dev;
|
||||||
struct q6asm_dai_rtd *prtd;
|
struct q6asm_dai_rtd *prtd;
|
||||||
|
|
|
@ -926,7 +926,7 @@ static int routing_hw_params(struct snd_soc_component *component,
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct msm_routing_data *data = dev_get_drvdata(component->dev);
|
struct msm_routing_data *data = dev_get_drvdata(component->dev);
|
||||||
unsigned int be_id = rtd->cpu_dai->id;
|
unsigned int be_id = asoc_rtd_to_cpu(rtd, 0)->id;
|
||||||
struct session_data *session;
|
struct session_data *session;
|
||||||
int path_type;
|
int path_type;
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ static int sdm845_slim_snd_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 = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct snd_soc_dai *codec_dai;
|
struct snd_soc_dai *codec_dai;
|
||||||
struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
|
struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
|
||||||
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
|
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
|
||||||
|
@ -86,7 +86,7 @@ static int sdm845_tdm_snd_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 = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct snd_soc_dai *codec_dai;
|
struct snd_soc_dai *codec_dai;
|
||||||
int ret = 0, j;
|
int ret = 0, j;
|
||||||
int channels, slot_width;
|
int channels, slot_width;
|
||||||
|
@ -171,8 +171,8 @@ static int sdm845_snd_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 = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
switch (cpu_dai->id) {
|
switch (cpu_dai->id) {
|
||||||
|
@ -220,8 +220,8 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_soc_component *component;
|
struct snd_soc_component *component;
|
||||||
struct snd_soc_card *card = rtd->card;
|
struct snd_soc_card *card = rtd->card;
|
||||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(card);
|
struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(card);
|
||||||
struct snd_jack *jack;
|
struct snd_jack *jack;
|
||||||
/*
|
/*
|
||||||
|
@ -304,8 +304,8 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream)
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_card *card = rtd->card;
|
struct snd_soc_card *card = rtd->card;
|
||||||
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
|
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
||||||
int j;
|
int j;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -394,7 +394,7 @@ static void sdm845_snd_shutdown(struct snd_pcm_substream *substream)
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct snd_soc_card *card = rtd->card;
|
struct snd_soc_card *card = rtd->card;
|
||||||
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
|
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
|
|
||||||
switch (cpu_dai->id) {
|
switch (cpu_dai->id) {
|
||||||
case PRIMARY_MI2S_RX:
|
case PRIMARY_MI2S_RX:
|
||||||
|
@ -439,7 +439,7 @@ static int sdm845_snd_prepare(struct snd_pcm_substream *substream)
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
|
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
|
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -478,7 +478,7 @@ static int sdm845_snd_hw_free(struct snd_pcm_substream *substream)
|
||||||
{
|
{
|
||||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
|
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
||||||
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
|
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
|
||||||
|
|
||||||
if (sruntime && data->stream_prepared[cpu_dai->id]) {
|
if (sruntime && data->stream_prepared[cpu_dai->id]) {
|
||||||
|
|
|
@ -39,7 +39,7 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream,
|
||||||
*/
|
*/
|
||||||
sysclk_freq = rate * bitwidth * 2 * STORM_SYSCLK_MULT;
|
sysclk_freq = rate * bitwidth * 2 * STORM_SYSCLK_MULT;
|
||||||
|
|
||||||
ret = snd_soc_dai_set_sysclk(soc_runtime->cpu_dai, 0, sysclk_freq, 0);
|
ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(soc_runtime, 0), 0, sysclk_freq, 0);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(card->dev, "error setting sysclk to %u: %d\n",
|
dev_err(card->dev, "error setting sysclk to %u: %d\n",
|
||||||
sysclk_freq, ret);
|
sysclk_freq, ret);
|
||||||
|
|
Loading…
Reference in a new issue