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

ASoC: amd: merge DAI call back functions into ops 



ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pm3xb0va.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/amd/acp/acp-i2s.c

+12 −12
Original line number Diff line number Diff line
@@ -539,17 +539,7 @@ static int acp_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_d 
	return 0;

}



const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops = {

	.startup = acp_i2s_startup,

	.hw_params = acp_i2s_hwparams,

	.prepare = acp_i2s_prepare,

	.trigger = acp_i2s_trigger,

	.set_fmt = acp_i2s_set_fmt,

	.set_tdm_slot = acp_i2s_set_tdm_slot,

};

EXPORT_SYMBOL_NS_GPL(asoc_acp_cpu_dai_ops, SND_SOC_ACP_COMMON);



int asoc_acp_i2s_probe(struct snd_soc_dai *dai)

static int acp_i2s_probe(struct snd_soc_dai *dai)

{

	struct device *dev = dai->component->dev;

	struct acp_dev_data *adata = dev_get_drvdata(dev);
@@ -569,7 +559,17 @@ int asoc_acp_i2s_probe(struct snd_soc_dai *dai) 


	return 0;

}

EXPORT_SYMBOL_NS_GPL(asoc_acp_i2s_probe, SND_SOC_ACP_COMMON);



const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops = {

	.probe		= acp_i2s_probe,

	.startup	= acp_i2s_startup,

	.hw_params	= acp_i2s_hwparams,

	.prepare	= acp_i2s_prepare,

	.trigger	= acp_i2s_trigger,

	.set_fmt	= acp_i2s_set_fmt,

	.set_tdm_slot	= acp_i2s_set_tdm_slot,

};

EXPORT_SYMBOL_NS_GPL(asoc_acp_cpu_dai_ops, SND_SOC_ACP_COMMON);



MODULE_LICENSE("Dual BSD/GPL");

MODULE_ALIAS(DRV_NAME);

sound/soc/amd/acp/acp-rembrandt.c

+0 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { 
		.rate_max = 48000,

	},

	.ops = &asoc_acp_cpu_dai_ops,

	.probe = &asoc_acp_i2s_probe,

},

{

	.name = "acp-i2s-bt",
@@ -124,7 +123,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { 
		.rate_max = 48000,

	},

	.ops = &asoc_acp_cpu_dai_ops,

	.probe = &asoc_acp_i2s_probe,

},

{

	.name = "acp-i2s-hs",
@@ -150,7 +148,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { 
		.rate_max = 48000,

	},

	.ops = &asoc_acp_cpu_dai_ops,

	.probe = &asoc_acp_i2s_probe,

},

{

	.name = "acp-pdm-dmic",

sound/soc/amd/acp/acp-renoir.c

+0 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static struct snd_soc_dai_driver acp_renoir_dai[] = { 
		.rate_max = 48000,

	},

	.ops = &asoc_acp_cpu_dai_ops,

	.probe = &asoc_acp_i2s_probe,

},

{

	.name = "acp-i2s-bt",
@@ -123,7 +122,6 @@ static struct snd_soc_dai_driver acp_renoir_dai[] = { 
		.rate_max = 48000,

	},

	.ops = &asoc_acp_cpu_dai_ops,

	.probe = &asoc_acp_i2s_probe,

},

{

	.name = "acp-pdm-dmic",

sound/soc/amd/acp/amd.h

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ union acp_i2stdm_mstrclkgen { 
extern const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops;

extern const struct snd_soc_dai_ops acp_dmic_dai_ops;



int asoc_acp_i2s_probe(struct snd_soc_dai *dai);

int acp_platform_register(struct device *dev);

int acp_platform_unregister(struct device *dev);