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

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
...@@ -170,7 +170,6 @@ struct sysmmu_drvdata { ...@@ -170,7 +170,6 @@ struct sysmmu_drvdata {
struct list_head node; /* entry of exynos_iommu_domain.clients */ struct list_head node; /* entry of exynos_iommu_domain.clients */
struct device *sysmmu; /* System MMU's device descriptor */ struct device *sysmmu; /* System MMU's device descriptor */
struct device *dev; /* Owner of system MMU */ struct device *dev; /* Owner of system MMU */
char *dbgname;
void __iomem *sfrbase; void __iomem *sfrbase;
struct clk *clk; struct clk *clk;
int activations; int activations;
...@@ -321,8 +320,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) ...@@ -321,8 +320,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
if (!ret && (itype != SYSMMU_FAULT_UNKNOWN)) if (!ret && (itype != SYSMMU_FAULT_UNKNOWN))
__raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR); __raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR);
else else
dev_dbg(data->sysmmu, "(%s) %s is not handled.\n", dev_dbg(data->sysmmu, "%s is not handled.\n",
data->dbgname, sysmmu_fault_name[itype]); sysmmu_fault_name[itype]);
if (itype != SYSMMU_FAULT_UNKNOWN) if (itype != SYSMMU_FAULT_UNKNOWN)
sysmmu_unblock(data->sfrbase); sysmmu_unblock(data->sfrbase);
...@@ -354,10 +353,10 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata *data) ...@@ -354,10 +353,10 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata *data)
write_unlock_irqrestore(&data->lock, flags); write_unlock_irqrestore(&data->lock, flags);
if (disabled) if (disabled)
dev_dbg(data->sysmmu, "(%s) Disabled\n", data->dbgname); dev_dbg(data->sysmmu, "Disabled\n");
else else
dev_dbg(data->sysmmu, "(%s) %d times left to be disabled\n", dev_dbg(data->sysmmu, "%d times left to be disabled\n",
data->dbgname, data->activations); data->activations);
return disabled; return disabled;
} }
...@@ -384,7 +383,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, ...@@ -384,7 +383,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data,
ret = 1; ret = 1;
} }
dev_dbg(data->sysmmu, "(%s) Already enabled\n", data->dbgname); dev_dbg(data->sysmmu, "Already enabled\n");
goto finish; goto finish;
} }
...@@ -399,7 +398,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data, ...@@ -399,7 +398,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data,
data->domain = domain; data->domain = domain;
dev_dbg(data->sysmmu, "(%s) Enabled\n", data->dbgname); dev_dbg(data->sysmmu, "Enabled\n");
finish: finish:
write_unlock_irqrestore(&data->lock, flags); write_unlock_irqrestore(&data->lock, flags);
...@@ -415,16 +414,15 @@ int exynos_sysmmu_enable(struct device *dev, unsigned long pgtable) ...@@ -415,16 +414,15 @@ int exynos_sysmmu_enable(struct device *dev, unsigned long pgtable)
ret = pm_runtime_get_sync(data->sysmmu); ret = pm_runtime_get_sync(data->sysmmu);
if (ret < 0) { if (ret < 0) {
dev_dbg(data->sysmmu, "(%s) Failed to enable\n", data->dbgname); dev_dbg(data->sysmmu, "Failed to enable\n");
return ret; return ret;
} }
ret = __exynos_sysmmu_enable(data, pgtable, NULL); ret = __exynos_sysmmu_enable(data, pgtable, NULL);
if (WARN_ON(ret < 0)) { if (WARN_ON(ret < 0)) {
pm_runtime_put(data->sysmmu); pm_runtime_put(data->sysmmu);
dev_err(data->sysmmu, dev_err(data->sysmmu, "Already enabled with page table %#x\n",
"(%s) Already enabled with page table %#x\n", data->pgtable);
data->dbgname, data->pgtable);
} else { } else {
data->dev = dev; data->dev = dev;
} }
...@@ -474,9 +472,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, ...@@ -474,9 +472,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova,
sysmmu_unblock(data->sfrbase); sysmmu_unblock(data->sfrbase);
} }
} else { } else {
dev_dbg(data->sysmmu, dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n");
"(%s) Disabled. Skipping invalidating TLB.\n",
data->dbgname);
} }
read_unlock_irqrestore(&data->lock, flags); read_unlock_irqrestore(&data->lock, flags);
...@@ -495,9 +491,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) ...@@ -495,9 +491,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
sysmmu_unblock(data->sfrbase); sysmmu_unblock(data->sfrbase);
} }
} else { } else {
dev_dbg(data->sysmmu, dev_dbg(data->sysmmu, "Disabled. Skipping invalidating TLB.\n");
"(%s) Disabled. Skipping invalidating TLB.\n",
data->dbgname);
} }
read_unlock_irqrestore(&data->lock, flags); read_unlock_irqrestore(&data->lock, flags);
...@@ -560,7 +554,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) ...@@ -560,7 +554,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
dev_dbg(dev, "(%s) Initialized\n", data->dbgname); dev_dbg(dev, "Initialized\n");
return 0; return 0;
err_irq: err_irq:
free_irq(platform_get_irq(pdev, 0), data); free_irq(platform_get_irq(pdev, 0), data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment