Revert "Replace alloc_pages with alloc_pages_op in zhaoxin_kh40000.c"

Link:#394 Link:https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.49&id=05d2e16a9e3aa4aea34a26f45c6455e3b2ca247a This reverts commit b448d17. Signed-off-by: Wentao Guan <[email protected]>
deepin-community · Sep 5, 2024 · 24ec0fa · 24ec0fa
1 parent a4beb3f
commit 24ec0fa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/arch/x86/kernel/zhaoxin_kh40000.c b/arch/x86/kernel/zhaoxin_kh40000.c
@@ -162,7 +162,7 @@ const struct dma_map_ops kh40000_dma_direct_ops = {
 	.unmap_resource		= kh40000_dma_direct_unmap_resource,
 	.dma_supported		= dma_direct_supported,
 	.free			= dma_direct_free,
-	.alloc_pages_op		= dma_direct_alloc_pages,
+	.alloc_pages		= dma_direct_alloc_pages,
 	.free_pages		= dma_direct_free_pages,
 	.sync_single_for_device	= dma_direct_sync_single_for_device,
 	.sync_sg_for_device	= dma_direct_sync_sg_for_device,
@@ -200,7 +200,7 @@ static void kh40000_iommu_dma_free(struct device *dev, size_t size, void *cpu_ad
 static struct page *kh40000_dma_common_alloc_pages(struct device *dev, size_t size,
 		dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp)
 {
-	return iommu_dma_ops->alloc_pages_op(dev, size, dma_handle, dir, gfp);
+	return iommu_dma_ops->alloc_pages(dev, size, dma_handle, dir, gfp);
 }
 
 static void kh40000_dma_common_free_pages(struct device *dev, size_t size, struct page *page,
@@ -327,7 +327,7 @@ const struct dma_map_ops kh40000_dma_iommu_ops = {
 	.alloc			= kh40000_iommu_dma_alloc,
 	.free			= kh40000_iommu_dma_free,
 	.unmap_page		= kh40000_iommu_dma_unmap_page,
-	.alloc_pages_op		= kh40000_dma_common_alloc_pages,
+	.alloc_pages		= kh40000_dma_common_alloc_pages,
 	.free_pages		= kh40000_dma_common_free_pages,
 	.alloc_noncontiguous	= kh40000_iommu_dma_alloc_noncontiguous,
 	.free_noncontiguous	= kh40000_iommu_dma_free_noncontiguous,