Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9133b99 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Joerg Roedel
Browse files

iommu/exynos: Use struct exynos_iommu_domain in internal structures 



Replace all remaining usage of struct iommu_domain with struct
exynos_iommu_domain in all internal structures and functions.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent bfa00489

drivers/iommu/exynos-iommu.c

+5 −5
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct sysmmu_drvdata { 
	struct clk *clk_master;

	int activations;

	spinlock_t lock;

	struct iommu_domain *domain;

	struct exynos_iommu_domain *domain;

	struct list_head domain_node;

	phys_addr_t pgtable;

	unsigned int version;
@@ -337,7 +337,7 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) 
		show_fault_information(dev_name(data->sysmmu),

					itype, base, addr);

		if (data->domain)

			ret = report_iommu_fault(data->domain,

			ret = report_iommu_fault(&data->domain->domain,

					data->master, addr, itype);

	}
@@ -436,7 +436,7 @@ static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data) 
}



static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable,

			   struct iommu_domain *iommu_domain)

			   struct exynos_iommu_domain *domain)

{

	int ret = 0;

	unsigned long flags;
@@ -444,7 +444,7 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable, 
	spin_lock_irqsave(&data->lock, flags);

	if (set_sysmmu_active(data)) {

		data->pgtable = pgtable;

		data->domain = iommu_domain;

		data->domain = domain;



		__sysmmu_enable_nocount(data);
@@ -702,7 +702,7 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, 


	data = dev_get_drvdata(owner->sysmmu);

	if (data) {

		ret = __sysmmu_enable(data, pagetable, iommu_domain);

		ret = __sysmmu_enable(data, pagetable, domain);

		if (ret >= 0) {

			data->master = dev;