clk: samsung: exynos5410: Add clock IDs for PDMA and EPLL clocks

[mirror_ubuntu-bionic-kernel.git] / drivers / remoteproc / qcom_q6v5_pil.c

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 24791886219a2b7c61cadc34d1e29e7e814390db..2a1b2c7d8f2cd175fd92f2aae92796209df2b1ea 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -349,13 +349,12 @@ static void q6v5proc_halt_axi_port(struct q6v5 *qproc,
 
 static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
 {
-       DEFINE_DMA_ATTRS(attrs);
+       unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS;
        dma_addr_t phys;
        void *ptr;
        int ret;
 
-       dma_set_attr(DMA_ATTR_FORCE_CONTIGUOUS, &attrs);
-       ptr = dma_alloc_attrs(qproc->dev, fw->size, &phys, GFP_KERNEL, &attrs);
+       ptr = dma_alloc_attrs(qproc->dev, fw->size, &phys, GFP_KERNEL, dma_attrs);
        if (!ptr) {
                dev_err(qproc->dev, "failed to allocate mdt buffer\n");
                return -ENOMEM;
@@ -372,7 +371,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
        else if (ret < 0)
                dev_err(qproc->dev, "MPSS header authentication failed: %d\n", ret);
 
-       dma_free_attrs(qproc->dev, fw->size, ptr, phys, &attrs);
+       dma_free_attrs(qproc->dev, fw->size, ptr, phys, dma_attrs);
 
        return ret < 0 ? ret : 0;
 }