diff options
author | Stefano Stabellini <sstabellini@kernel.org> | 2017-04-13 17:04:22 -0400 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2017-05-02 05:14:47 -0400 |
commit | d5ff5061c35448525fcb38950f06af6b9ae12c04 (patch) | |
tree | 68f295eb70b6bf1a0c5a6de030b1de3149bf188a /drivers/xen/swiotlb-xen.c | |
parent | e058632670b709145730a134acc3f83f392f7aa7 (diff) |
xen/arm,arm64: rename __generic_dma_ops to xen_get_dma_ops
Now that __generic_dma_ops is a xen specific function, rename it to
xen_get_dma_ops. Change all the call sites appropriately.
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: linux@armlinux.org.uk
CC: catalin.marinas@arm.com
CC: will.deacon@arm.com
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
CC: Julien Grall <julien.grall@arm.com>
Diffstat (limited to 'drivers/xen/swiotlb-xen.c')
-rw-r--r-- | drivers/xen/swiotlb-xen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index e8cef1ad0fe3..8dab0d3dc172 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
@@ -693,8 +693,8 @@ xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma, | |||
693 | unsigned long attrs) | 693 | unsigned long attrs) |
694 | { | 694 | { |
695 | #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) | 695 | #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) |
696 | if (__generic_dma_ops(dev)->mmap) | 696 | if (xen_get_dma_ops(dev)->mmap) |
697 | return __generic_dma_ops(dev)->mmap(dev, vma, cpu_addr, | 697 | return xen_get_dma_ops(dev)->mmap(dev, vma, cpu_addr, |
698 | dma_addr, size, attrs); | 698 | dma_addr, size, attrs); |
699 | #endif | 699 | #endif |
700 | return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size); | 700 | return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size); |
@@ -711,7 +711,7 @@ xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt, | |||
711 | unsigned long attrs) | 711 | unsigned long attrs) |
712 | { | 712 | { |
713 | #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) | 713 | #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) |
714 | if (__generic_dma_ops(dev)->get_sgtable) { | 714 | if (xen_get_dma_ops(dev)->get_sgtable) { |
715 | #if 0 | 715 | #if 0 |
716 | /* | 716 | /* |
717 | * This check verifies that the page belongs to the current domain and | 717 | * This check verifies that the page belongs to the current domain and |
@@ -721,7 +721,7 @@ xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt, | |||
721 | unsigned long bfn = PHYS_PFN(dma_to_phys(dev, handle)); | 721 | unsigned long bfn = PHYS_PFN(dma_to_phys(dev, handle)); |
722 | BUG_ON (!page_is_ram(bfn)); | 722 | BUG_ON (!page_is_ram(bfn)); |
723 | #endif | 723 | #endif |
724 | return __generic_dma_ops(dev)->get_sgtable(dev, sgt, cpu_addr, | 724 | return xen_get_dma_ops(dev)->get_sgtable(dev, sgt, cpu_addr, |
725 | handle, size, attrs); | 725 | handle, size, attrs); |
726 | } | 726 | } |
727 | #endif | 727 | #endif |