Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8999390e authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: Drop usage of struct s3c_dma_params from s3c24xx-i2s.c 



struct s3c_dma_params already includes struct snd_dmaengine_dai_dma_data,
there is no need for such an indirection so switch to using struct
snd_dmaengine_dai_dma_data instead of struct s3c_dma_params.  This also
allows us to use snd_soc_dai_init_dma_data() function instead of the
platform specific samsung_asoc_init_dma_data helper.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 69e7a69a

sound/soc/samsung/s3c24xx-i2s.c

+12 −12
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ 


#include <linux/platform_data/asoc-s3c.h>



static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = {

	.ch_name	= "tx",

	.dma_size	= 2,

static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = {

	.chan_name	= "tx",

	.addr_width	= 2,

};



static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = {

	.ch_name	= "rx",

	.dma_size	= 2,

static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_in = {

	.chan_name	= "rx",

	.addr_width	= 2,

};



struct s3c24xx_i2s_info {
@@ -360,7 +360,7 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) 
{

	pr_debug("Entered %s\n", __func__);



	samsung_asoc_init_dma_data(dai, &s3c24xx_i2s_pcm_stereo_out,

	snd_soc_dai_init_dma_data(dai, &s3c24xx_i2s_pcm_stereo_out,

					&s3c24xx_i2s_pcm_stereo_in);



	s3c24xx_i2s.iis_clk = devm_clk_get(dai->dev, "iis");
@@ -469,10 +469,10 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) 
	if (IS_ERR(s3c24xx_i2s.regs))

		return PTR_ERR(s3c24xx_i2s.regs);



	s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO;

	s3c24xx_i2s_pcm_stereo_out.slave = pdata->dma_playback;

	s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO;

	s3c24xx_i2s_pcm_stereo_in.slave = pdata->dma_capture;

	s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO;

	s3c24xx_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;

	s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO;

	s3c24xx_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;



	ret = devm_snd_soc_register_component(&pdev->dev,

			&s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);