From b52020e822e445171e09dd96c4ec5586f8b9f0a9 Mon Sep 17 00:00:00 2001 From: Vijayanand Jitta Date: Wed, 21 Nov 2018 13:09:57 +0530 Subject: [PATCH] iommu: Fix multiple definitions of msm_dma_unmap_sg_attrs Add static and inline to msm_dma_unmap_sg_attrs to fix multiple definition compilation errors when CONFIG_QCOM_LAZY_MAP is not selected. Change-Id: I2aa56d85459e7144d279521905d0cb3225b39648 Signed-off-by: Vijayanand Jitta --- include/linux/msm_dma_iommu_mapping.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/msm_dma_iommu_mapping.h b/include/linux/msm_dma_iommu_mapping.h index a30a19682dd5..ae20f0990a98 100644 --- a/include/linux/msm_dma_iommu_mapping.h +++ b/include/linux/msm_dma_iommu_mapping.h @@ -105,9 +105,10 @@ static inline void msm_dma_unmap_sg(struct device *dev, { } -void msm_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, - int nents, enum dma_data_direction dir, - struct dma_buf *dma_buf, unsigned long attrs) +static inline void msm_dma_unmap_sg_attrs(struct device *dev, + struct scatterlist *sgl, + int nents, enum dma_data_direction dir, + struct dma_buf *dma_buf, unsigned long attrs) { }