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

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

ASoC: samsung: Drop usage of struct s3c_dma_params from s3c2412-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 8999390e

sound/soc/samsung/s3c-i2s-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_soc_dai *dai)

{

	struct s3c_i2sv2_info *i2s = to_info(dai);

	struct s3c_dma_params *dma_data;

	struct snd_dmaengine_dai_dma_data *dma_data;

	u32 iismod;



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

sound/soc/samsung/s3c-i2s-v2.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ struct s3c_i2sv2_info { 


	unsigned char	 master;



	struct s3c_dma_params	*dma_playback;

	struct s3c_dma_params	*dma_capture;

	struct snd_dmaengine_dai_dma_data *dma_playback;

	struct snd_dmaengine_dai_dma_data *dma_capture;



	u32		 suspend_iismod;

	u32		 suspend_iiscon;

sound/soc/samsung/s3c2412-i2s.c

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


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



static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = {

	.ch_name	= "tx",

	.dma_size	= 4,

static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = {

	.chan_name	= "tx",

	.addr_width	= 4,

};



static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = {

	.ch_name	= "rx",

	.dma_size	= 4,

static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = {

	.chan_name	= "rx",

	.addr_width	= 4,

};



static struct s3c_i2sv2_info s3c2412_i2s;
@@ -52,7 +52,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai) 


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



	samsung_asoc_init_dma_data(dai, &s3c2412_i2s_pcm_stereo_out,

	snd_soc_dai_init_dma_data(dai, &s3c2412_i2s_pcm_stereo_out,

					&s3c2412_i2s_pcm_stereo_in);



	ret = s3c_i2sv2_probe(dai, &s3c2412_i2s, S3C2410_PA_IIS);
@@ -163,10 +163,10 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) 
	if (IS_ERR(s3c2412_i2s.regs))

		return PTR_ERR(s3c2412_i2s.regs);



	s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD;

	s3c2412_i2s_pcm_stereo_out.slave = pdata->dma_playback;

	s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD;

	s3c2412_i2s_pcm_stereo_in.slave = pdata->dma_capture;

	s3c2412_i2s_pcm_stereo_out.addr = res->start + S3C2412_IISTXD;

	s3c2412_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;

	s3c2412_i2s_pcm_stereo_in.addr = res->start + S3C2412_IISRXD;

	s3c2412_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;



	ret = s3c_i2sv2_register_component(&pdev->dev, -1,

					   &s3c2412_i2s_component,