Skip to content

Commit 9c8fd9a

Browse files
committed
Revert "Replace alloc_pages with alloc_pages_op in zhaoxin_kh40000.c"
Link:deepin-community#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 <guanwentao@uniontech.com>
1 parent 26367b9 commit 9c8fd9a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/kernel/zhaoxin_kh40000.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const struct dma_map_ops kh40000_dma_direct_ops = {
162162
.unmap_resource = kh40000_dma_direct_unmap_resource,
163163
.dma_supported = dma_direct_supported,
164164
.free = dma_direct_free,
165-
.alloc_pages_op = dma_direct_alloc_pages,
165+
.alloc_pages = dma_direct_alloc_pages,
166166
.free_pages = dma_direct_free_pages,
167167
.sync_single_for_device = dma_direct_sync_single_for_device,
168168
.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
200200
static struct page *kh40000_dma_common_alloc_pages(struct device *dev, size_t size,
201201
dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp)
202202
{
203-
return iommu_dma_ops->alloc_pages_op(dev, size, dma_handle, dir, gfp);
203+
return iommu_dma_ops->alloc_pages(dev, size, dma_handle, dir, gfp);
204204
}
205205

206206
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 = {
327327
.alloc = kh40000_iommu_dma_alloc,
328328
.free = kh40000_iommu_dma_free,
329329
.unmap_page = kh40000_iommu_dma_unmap_page,
330-
.alloc_pages_op = kh40000_dma_common_alloc_pages,
330+
.alloc_pages = kh40000_dma_common_alloc_pages,
331331
.free_pages = kh40000_dma_common_free_pages,
332332
.alloc_noncontiguous = kh40000_iommu_dma_alloc_noncontiguous,
333333
.free_noncontiguous = kh40000_iommu_dma_free_noncontiguous,

0 commit comments

Comments
 (0)