Commit e5cf63c3 authored by Cho KyongHo's avatar Cho KyongHo Committed by Joerg Roedel
Browse files

iommu/exynos: Remove dbgname from drvdata of a System MMU 



This patch removes dbgname member from sysmmu_drvdata structure.
Kernel message for debugging already has the name of a single
System MMU node. It also removes some compilation warnings.

Signed-off-by: default avatarCho KyongHo <pullip.cho@samsung.com>
Signed-off-by: default avatarShaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f4723ec1

drivers/iommu/exynos-iommu.c

+13 −19
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ struct sysmmu_drvdata { 
	struct list_head node; /* entry of exynos_iommu_domain.clients */

	struct device *sysmmu;	/* System MMU's device descriptor */

	struct device *dev;	/* Owner of system MMU */

	char *dbgname;

	void __iomem *sfrbase;

	struct clk *clk;

	int activations;
@@ -321,8 +320,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) 
	if (!ret && (itype != SYSMMU_FAULT_UNKNOWN))

		__raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR);

	else

		dev_dbg(data->sysmmu, "(%s) %s is not handled.\n",

				data->dbgname, sysmmu_fault_name[itype]);

		dev_dbg(data->sysmmu, "%s is not handled.\n",

				sysmmu_fault_name[itype]);



	if (itype != SYSMMU_FAULT_UNKNOWN)

		sysmmu_unblock(data->sfrbase);
@@ -354,10 +353,10 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata *data) 
	write_unlock_irqrestore(&data->lock, flags);



	if (disabled)

		dev_dbg(data->sysmmu, "(%s) Disabled\n", data->dbgname);

		dev_dbg(data->sysmmu, "Disabled\n");

	else

		dev_dbg(data->sysmmu, "(%s) %d times left to be disabled\n",

					data->dbgname, data->activations);

		dev_dbg(data->sysmmu, "%d times left to be disabled\n",

					data->activations);



	return disabled;

}
@@ -384,7 +383,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, 
			ret = 1;

		}



		dev_dbg(data->sysmmu, "(%s) Already enabled\n", data->dbgname);

		dev_dbg(data->sysmmu, "Already enabled\n");

		goto finish;

	}
@@ -399,7 +398,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, 


	data->domain = domain;



	dev_dbg(data->sysmmu, "(%s) Enabled\n", data->dbgname);

	dev_dbg(data->sysmmu, "Enabled\n");

finish:

	write_unlock_irqrestore(&data->lock, flags);
@@ -415,16 +414,15 @@ int exynos_sysmmu_enable(struct device *dev, unsigned long pgtable) 


	ret = pm_runtime_get_sync(data->sysmmu);

	if (ret < 0) {

		dev_dbg(data->sysmmu, "(%s) Failed to enable\n", data->dbgname);

		dev_dbg(data->sysmmu, "Failed to enable\n");

		return ret;

	}



	ret = __exynos_sysmmu_enable(data, pgtable, NULL);

	if (WARN_ON(ret < 0)) {

		pm_runtime_put(data->sysmmu);

		dev_err(data->sysmmu,

			"(%s) Already enabled with page table %#x\n",

			data->dbgname, data->pgtable);

		dev_err(data->sysmmu, "Already enabled with page table %#x\n",

			data->pgtable);

	} else {

		data->dev = dev;

	}
@@ -474,9 +472,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, 
			sysmmu_unblock(data->sfrbase);

		}

	} else {

		dev_dbg(data->sysmmu,

			"(%s) Disabled. Skipping invalidating TLB.\n",

			data->dbgname);

		dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n");

	}



	read_unlock_irqrestore(&data->lock, flags);
@@ -495,9 +491,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) 
			sysmmu_unblock(data->sfrbase);

		}

	} else {

		dev_dbg(data->sysmmu,

			"(%s) Disabled. Skipping invalidating TLB.\n",

			data->dbgname);

		dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n");

	}



	read_unlock_irqrestore(&data->lock, flags);
@@ -560,7 +554,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) 


	pm_runtime_enable(dev);



	dev_dbg(dev, "(%s) Initialized\n", data->dbgname);

	dev_dbg(dev, "Initialized\n");

	return 0;

err_irq:

	free_irq(platform_get_irq(pdev, 0), data);