Skip to contentSkip to conversation

media: ipu6: Make ipu6_dma_{un,}map_sg() static

PATCH In review Sakari Ailus 2 participants 2 messages Nov 18

Subsystems (2)
lore
Share & tools
lore

Sakari Ailus

author maintainer
#0 lore raw

PATCH 1/1 media: ipu6: Make ipu6_dma_{un,}map_sg() static

Make ipu6_dma_map_sg() and ipu6_dma_unmap_sg() static as they are only used within the same file.

---
 drivers/media/pci/intel/ipu6/ipu6-dma.c | 14 ++++++--------
 drivers/media/pci/intel/ipu6/ipu6-dma.h |  6 ------
 2 files changed, 6 insertions(+), 14 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-dma.c +6 -8
index 90f530a93779..ea13a58a80f8 100644
@@ -327,9 +327,9 @@ int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma,
 	return 0;
 }
 
-void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
-		       int nents, enum dma_data_direction dir,
-		       unsigned long attrs)
+static void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys,
+			      struct scatterlist *sglist, int nents,
+			      enum dma_data_direction dir, unsigned long attrs)
 {
 	struct device *dev = &sys->auxdev.dev;
 	struct ipu6_mmu *mmu = sys->mmu;
@@ -369,7 +369,6 @@ void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
 	mmu->ops->tlb_invalidate(mmu);
 	__free_iova(&mmu->dmap->iovad, iova);
 }
-EXPORT_SYMBOL_NS_GPL(ipu6_dma_unmap_sg, "INTEL_IPU6");
 
 static struct iova *ipu7_get_fw_code_region(struct ipu6_bus_device *sys)
 {
@@ -382,9 +381,9 @@ static struct iova *ipu7_get_fw_code_region(struct ipu6_bus_device *sys)
 	return reserve_iova(&mmu->dmap->iovad, lo, hi);
 }
 
-int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
-		    int nents, enum dma_data_direction dir,
-		    unsigned long attrs)
+static int ipu6_dma_map_sg(struct ipu6_bus_device *sys,
+			   struct scatterlist *sglist, int nents,
+			   enum dma_data_direction dir, unsigned long attrs)
 {
 	struct device *dev = &sys->auxdev.dev;
 	struct ipu6_mmu *mmu = sys->mmu;
@@ -448,7 +447,6 @@ int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
 
 	return 0;
 }
-EXPORT_SYMBOL_NS_GPL(ipu6_dma_map_sg, "INTEL_IPU6");
 
 int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt,
 			 enum dma_data_direction dir, unsigned long attrs)
drivers/media/pci/intel/ipu6/ipu6-dma.h +0 -6
index e5e0e7860423..bd1a0481f1ac 100644
@@ -32,12 +32,6 @@ void ipu6_dma_free(struct ipu6_bus_device *sys, size_t size, void *vaddr,
 int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma,
 		  void *addr, dma_addr_t iova, size_t size,
 		  unsigned long attrs);
-int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
-		    int nents, enum dma_data_direction dir,
-		    unsigned long attrs);
-void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
-		       int nents, enum dma_data_direction dir,
-		       unsigned long attrs);
 int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt,
 			 enum dma_data_direction dir, unsigned long attrs);
 void ipu6_dma_unmap_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt,
Signature · 1 line
2.47.3
#1 lore raw

Hi Sakari,

Quoted 2 lines · Sakari Ailus

Make ipu6_dma_map_sg() and ipu6_dma_unmap_sg() static as they are only used within the same file.

This is also the case for ipu6_dma_sync_sg()

Quoted 2 lines

--
Kind Regards
Mehdi Djait