Commit 552d1ef6 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core - Optimise and refactor pcm_new() to pass only rtd 



Currently pcm_new() passes in 3 arguments :- card, pcm and DAI.

Refactor this to only pass in 1 argument (i.e. the rtd) since struct rtd contains
card, pcm and DAI along with other members too that are useful too.

Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cf3383fb

include/sound/soc.h

+1 −2
Original line number Diff line number Diff line
@@ -624,8 +624,7 @@ struct snd_soc_platform_driver { 
	int (*resume)(struct snd_soc_dai *dai);



	/* pcm creation and destruction */

	int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,

		struct snd_pcm *);

	int (*pcm_new)(struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_pcm *);



	/*

sound/soc/atmel/atmel-pcm.c

+4 −2
Original line number Diff line number Diff line
@@ -364,9 +364,11 @@ static struct snd_pcm_ops atmel_pcm_ops = { 
\*--------------------------------------------------------------------------*/

static u64 atmel_pcm_dmamask = 0xffffffff;



static int atmel_pcm_new(struct snd_card *card,

	struct snd_soc_dai *dai, struct snd_pcm *pcm)

static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;



	if (!card->dev->dma_mask)

sound/soc/au1x/dbdma2.c

+4 −3
Original line number Diff line number Diff line
@@ -319,10 +319,11 @@ static void au1xpsc_pcm_free_dma_buffers(struct snd_pcm *pcm) 
	snd_pcm_lib_preallocate_free_for_all(pcm);

}



static int au1xpsc_pcm_new(struct snd_card *card,

			   struct snd_soc_dai *dai,

			   struct snd_pcm *pcm)

static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

		card->dev, AU1XPSC_BUFFER_MIN_BYTES, (4096 * 1024) - 1);

sound/soc/blackfin/bf5xx-ac97-pcm.c

+4 −2
Original line number Diff line number Diff line
@@ -418,9 +418,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) 


static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);



int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai,

	struct snd_pcm *pcm)

int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;



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

sound/soc/blackfin/bf5xx-i2s-pcm.c

+4 −2
Original line number Diff line number Diff line
@@ -248,9 +248,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) 


static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);



int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai,

	struct snd_pcm *pcm)

int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE