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

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

ASoC: samsung: Drop usage of struct s3c_dma_params from spdif.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 996d81e1

sound/soc/samsung/spdif.c

+6 −6
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ struct samsung_spdif_info { 
	u32		saved_clkcon;

	u32		saved_con;

	u32		saved_cstas;

	struct s3c_dma_params	*dma_playback;

	struct snd_dmaengine_dai_dma_data *dma_playback;

};



static struct s3c_dma_params spdif_stereo_out;

static struct snd_dmaengine_dai_dma_data spdif_stereo_out;

static struct samsung_spdif_info spdif_info;



static inline struct samsung_spdif_info *to_info(struct snd_soc_dai *cpu_dai)
@@ -179,7 +179,7 @@ static int spdif_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct samsung_spdif_info *spdif = to_info(rtd->cpu_dai);

	void __iomem *regs = spdif->regs;

	struct s3c_dma_params *dma_data;

	struct snd_dmaengine_dai_dma_data *dma_data;

	u32 con, clkcon, cstas;

	unsigned long flags;

	int i, ratio;
@@ -425,11 +425,11 @@ static int spdif_probe(struct platform_device *pdev) 
		goto err4;

	}



	spdif_stereo_out.dma_size = 2;

	spdif_stereo_out.dma_addr = mem_res->start + DATA_OUTBUF;

	spdif_stereo_out.addr_width = 2;

	spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF;

	filter = NULL;

	if (spdif_pdata) {

		spdif_stereo_out.slave = spdif_pdata->dma_playback;

		spdif_stereo_out.filter_data = spdif_pdata->dma_playback;

		filter = spdif_pdata->dma_filter;

	}