[5/8] sound: intel/sst: don't pass GFP_DMA32 to dma_alloc_coherent

Message ID 20181013151707.32210-6-hch@lst.de
State New
Headers show
Series
  • [1/8] cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent
Related show

Commit Message

Christoph Hellwig Oct. 13, 2018, 3:17 p.m.
The DMA API does its own zone decisions based on the coherent_dma_mask.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 sound/soc/intel/common/sst-firmware.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai Oct. 13, 2018, 4:20 p.m. | #1
On Sat, 13 Oct 2018 17:17:04 +0200,
Christoph Hellwig wrote:
> 
> The DMA API does its own zone decisions based on the coherent_dma_mask.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi

> ---
>  sound/soc/intel/common/sst-firmware.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
> index 11041aedea31..1e067504b604 100644
> --- a/sound/soc/intel/common/sst-firmware.c
> +++ b/sound/soc/intel/common/sst-firmware.c
> @@ -355,7 +355,7 @@ struct sst_fw *sst_fw_new(struct sst_dsp *dsp,
>  
>  	/* allocate DMA buffer to store FW data */
>  	sst_fw->dma_buf = dma_alloc_coherent(dsp->dma_dev, sst_fw->size,
> -				&sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL);
> +				&sst_fw->dmable_fw_paddr, GFP_KERNEL);
>  	if (!sst_fw->dma_buf) {
>  		dev_err(dsp->dev, "error: DMA alloc failed\n");
>  		kfree(sst_fw);
> -- 
> 2.19.1
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>

Patch

diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
index 11041aedea31..1e067504b604 100644
--- a/sound/soc/intel/common/sst-firmware.c
+++ b/sound/soc/intel/common/sst-firmware.c
@@ -355,7 +355,7 @@  struct sst_fw *sst_fw_new(struct sst_dsp *dsp,
 
 	/* allocate DMA buffer to store FW data */
 	sst_fw->dma_buf = dma_alloc_coherent(dsp->dma_dev, sst_fw->size,
-				&sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL);
+				&sst_fw->dmable_fw_paddr, GFP_KERNEL);
 	if (!sst_fw->dma_buf) {
 		dev_err(dsp->dev, "error: DMA alloc failed\n");
 		kfree(sst_fw);