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

ASoC: dwc: 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>
Reviewed-by: default avatarMaxim Kochetkov <fido_max@inbox.ru>
Link: https://lore.kernel.org/r/87o7jhb0v4.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/dwc/dwc-i2s.c

+9 −9
Original line number Diff line number Diff line
@@ -443,7 +443,16 @@ static int dw_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, unsigned int tx_mask 
	return 0;

}



static int dw_i2s_dai_probe(struct snd_soc_dai *dai)

{

	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);



	snd_soc_dai_init_dma_data(dai, &dev->play_dma_data, &dev->capture_dma_data);

	return 0;

}



static const struct snd_soc_dai_ops dw_i2s_dai_ops = {

	.probe		= dw_i2s_dai_probe,

	.hw_params	= dw_i2s_hw_params,

	.prepare	= dw_i2s_prepare,

	.trigger	= dw_i2s_trigger,
@@ -680,14 +689,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, 


}



static int dw_i2s_dai_probe(struct snd_soc_dai *dai)

{

	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);



	snd_soc_dai_init_dma_data(dai, &dev->play_dma_data, &dev->capture_dma_data);

	return 0;

}



static int dw_i2s_probe(struct platform_device *pdev)

{

	const struct i2s_platform_data *pdata = pdev->dev.platform_data;
@@ -706,7 +707,6 @@ static int dw_i2s_probe(struct platform_device *pdev) 
		return -ENOMEM;



	dw_i2s_dai->ops = &dw_i2s_dai_ops;

	dw_i2s_dai->probe = dw_i2s_dai_probe;



	dev->i2s_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(dev->i2s_base))