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

ASoC: qcom: 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/87a5v1b0ta.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/qcom/lpass-apq8016.c

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { 
			.channels_min	= 1,

			.channels_max	= 8,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	},

	[MI2S_SECONDARY] =  {
@@ -62,7 +61,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { 
			.channels_min	= 1,

			.channels_max	= 8,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	},

	[MI2S_TERTIARY] =  {
@@ -83,7 +81,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { 
			.channels_min	= 1,

			.channels_max	= 8,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	},

	[MI2S_QUATERNARY] =  {
@@ -119,7 +116,6 @@ static struct snd_soc_dai_driver apq8016_lpass_cpu_dai_driver[] = { 
			.channels_min	= 1,

			.channels_max	= 8,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	},

};

sound/soc/qcom/lpass-cpu.c

+25 −15
Original line number Diff line number Diff line
@@ -404,18 +404,7 @@ static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream, 
	return 0;

}



const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = {

	.set_sysclk	= lpass_cpu_daiops_set_sysclk,

	.startup	= lpass_cpu_daiops_startup,

	.shutdown	= lpass_cpu_daiops_shutdown,

	.hw_params	= lpass_cpu_daiops_hw_params,

	.trigger	= lpass_cpu_daiops_trigger,

	.prepare	= lpass_cpu_daiops_prepare,

};

EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops);



int lpass_cpu_pcm_new(struct snd_soc_pcm_runtime *rtd,

				struct snd_soc_dai *dai)

static int lpass_cpu_daiops_pcm_new(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	int ret;

	struct snd_soc_dai_driver *drv = dai->driver;
@@ -431,9 +420,8 @@ int lpass_cpu_pcm_new(struct snd_soc_pcm_runtime *rtd, 


	return 0;

}

EXPORT_SYMBOL_GPL(lpass_cpu_pcm_new);



int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai)

static int lpass_cpu_daiops_probe(struct snd_soc_dai *dai)

{

	struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);

	int ret;
@@ -446,7 +434,29 @@ int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai) 


	return ret;

}

EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_probe);



const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = {

	.probe		= lpass_cpu_daiops_probe,

	.set_sysclk	= lpass_cpu_daiops_set_sysclk,

	.startup	= lpass_cpu_daiops_startup,

	.shutdown	= lpass_cpu_daiops_shutdown,

	.hw_params	= lpass_cpu_daiops_hw_params,

	.trigger	= lpass_cpu_daiops_trigger,

	.prepare	= lpass_cpu_daiops_prepare,

};

EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops);



const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops2 = {

	.pcm_new	= lpass_cpu_daiops_pcm_new,

	.probe		= lpass_cpu_daiops_probe,

	.set_sysclk	= lpass_cpu_daiops_set_sysclk,

	.startup	= lpass_cpu_daiops_startup,

	.shutdown	= lpass_cpu_daiops_shutdown,

	.hw_params	= lpass_cpu_daiops_hw_params,

	.trigger	= lpass_cpu_daiops_trigger,

	.prepare	= lpass_cpu_daiops_prepare,

};

EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops2);



static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component,

				   const struct of_phandle_args *args,

sound/soc/qcom/lpass-ipq806x.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static struct snd_soc_dai_driver ipq806x_lpass_cpu_dai_driver = { 
		.channels_min	= 1,

		.channels_max	= 8,

	},

	.probe	= &asoc_qcom_lpass_cpu_dai_probe,

	.ops    = &asoc_qcom_lpass_cpu_dai_ops,

};

sound/soc/qcom/lpass-sc7180.c

+1 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static struct snd_soc_dai_driver sc7180_lpass_cpu_dai_driver[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	}, {

		.id = MI2S_SECONDARY,
@@ -57,9 +56,7 @@ static struct snd_soc_dai_driver sc7180_lpass_cpu_dai_driver[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

		.pcm_new = lpass_cpu_pcm_new,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops2,

	}, {

		.id = LPASS_DP_RX,

		.name = "Hdmi",

sound/soc/qcom/lpass-sc7280.c

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static struct snd_soc_dai_driver sc7280_lpass_cpu_dai_driver[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops    = &asoc_qcom_lpass_cpu_dai_ops,

	}, {

		.id = MI2S_SECONDARY,
@@ -52,7 +51,6 @@ static struct snd_soc_dai_driver sc7280_lpass_cpu_dai_driver[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

		},

		.probe	= &asoc_qcom_lpass_cpu_dai_probe,

		.ops	= &asoc_qcom_lpass_cpu_dai_ops,

	}, {

		.id = LPASS_DP_RX,