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

Commit 350e16d5 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Mark Brown
Browse files

ASoC: replace 0xffffffff with DMA_BIT_MASK macro 



Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6296914c

sound/soc/atmel/atmel-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static struct snd_pcm_ops atmel_pcm_ops = { 
/*--------------------------------------------------------------------------*\

 * ASoC platform driver

\*--------------------------------------------------------------------------*/

static u64 atmel_pcm_dmamask = 0xffffffff;

static u64 atmel_pcm_dmamask = DMA_BIT_MASK(32);



static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{
@@ -373,7 +373,7 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->dma_mask)

		card->dev->dma_mask = &atmel_pcm_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

sound/soc/davinci/davinci-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) 
	}

}



static u64 davinci_pcm_dmamask = 0xffffffff;

static u64 davinci_pcm_dmamask = DMA_BIT_MASK(32);



static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)

{
@@ -837,7 +837,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->dma_mask)

		card->dev->dma_mask = &davinci_pcm_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = davinci_pcm_preallocate_dma_buffer(pcm,

sound/soc/ep93xx/ep93xx-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void ep93xx_pcm_free_dma_buffers(struct snd_pcm *pcm) 
	}

}



static u64 ep93xx_pcm_dmamask = 0xffffffff;

static u64 ep93xx_pcm_dmamask = DMA_BIT_MASK(32);



static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd)

{
@@ -292,7 +292,7 @@ static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->dma_mask)

		card->dev->dma_mask = &ep93xx_pcm_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = ep93xx_pcm_preallocate_dma_buffer(pcm,

sound/soc/fsl/mpc5200_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static struct snd_pcm_ops psc_dma_ops = { 
	.hw_params	= psc_dma_hw_params,

};



static u64 psc_dma_dmamask = 0xffffffff;

static u64 psc_dma_dmamask = DMA_BIT_MASK(32);

static int psc_dma_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;
@@ -314,7 +314,7 @@ static int psc_dma_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->dma_mask)

		card->dev->dma_mask = &psc_dma_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,

sound/soc/kirkwood/kirkwood-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct snd_pcm_hardware kirkwood_dma_snd_hw = { 
	.fifo_size		= 0,

};



static u64 kirkwood_dma_dmamask = 0xFFFFFFFFUL;

static u64 kirkwood_dma_dmamask = DMA_BIT_MASK(32);



static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)

{
@@ -324,7 +324,7 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->dma_mask)

		card->dev->dma_mask = &kirkwood_dma_dmamask;

	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = kirkwood_dma_preallocate_dma_buffer(pcm,