diff options
Diffstat (limited to 'arch/arm/mach-tegra/iovmm-gart.c')
| -rw-r--r-- | arch/arm/mach-tegra/iovmm-gart.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/iovmm-gart.c b/arch/arm/mach-tegra/iovmm-gart.c index fbab0362c081..adf46991e3dc 100644 --- a/arch/arm/mach-tegra/iovmm-gart.c +++ b/arch/arm/mach-tegra/iovmm-gart.c @@ -56,10 +56,10 @@ struct gart_device { bool needs_barrier; /* emulator WAR */ }; -static int gart_map(struct tegra_iovmm_device *, struct tegra_iovmm_area *); -static void gart_unmap(struct tegra_iovmm_device *, +static int gart_map(struct tegra_iovmm_domain *, struct tegra_iovmm_area *); +static void gart_unmap(struct tegra_iovmm_domain *, struct tegra_iovmm_area *, bool); -static void gart_map_pfn(struct tegra_iovmm_device *, +static void gart_map_pfn(struct tegra_iovmm_domain *, struct tegra_iovmm_area *, tegra_iovmm_addr_t, unsigned long); static struct tegra_iovmm_domain *gart_alloc_domain( struct tegra_iovmm_device *, struct tegra_iovmm_client *); @@ -258,10 +258,10 @@ static void __exit gart_exit(void) #define GART_PTE(_pfn) (0x80000000ul | ((_pfn)<<PAGE_SHIFT)) -static int gart_map(struct tegra_iovmm_device *dev, +static int gart_map(struct tegra_iovmm_domain *domain, struct tegra_iovmm_area *iovma) { - struct gart_device *gart = container_of(dev, struct gart_device, iovmm); + struct gart_device *gart = container_of(domain, struct gart_device, domain); unsigned long gart_page, count; unsigned int i; @@ -301,10 +301,10 @@ fail: return -ENOMEM; } -static void gart_unmap(struct tegra_iovmm_device *dev, +static void gart_unmap(struct tegra_iovmm_domain *domain, struct tegra_iovmm_area *iovma, bool decommit) { - struct gart_device *gart = container_of(dev, struct gart_device, iovmm); + struct gart_device *gart = container_of(domain, struct gart_device, domain); unsigned long gart_page, count; unsigned int i; @@ -325,11 +325,11 @@ static void gart_unmap(struct tegra_iovmm_device *dev, wmb(); } -static void gart_map_pfn(struct tegra_iovmm_device *dev, +static void gart_map_pfn(struct tegra_iovmm_domain *domain, struct tegra_iovmm_area *iovma, tegra_iovmm_addr_t offs, unsigned long pfn) { - struct gart_device *gart = container_of(dev, struct gart_device, iovmm); + struct gart_device *gart = container_of(domain, struct gart_device, domain); BUG_ON(!pfn_valid(pfn)); spin_lock(&gart->pte_lock); |