redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

iommu/exynos: Simplify master clock operations 

All clock API function can be called on NULL clock, so simplify code avoid
checking of master clock presence.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
hifive-unleashed-5.1
Marek Szyprowski 2016-02-18 15:12:51 +01:00 committed by Joerg Roedel
parent 5e3435eb7e
commit b398af2169
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iommu/exynos-iommu.c
View File

@ -333,7 +333,6 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
spin_lock(&data->lock);
if (!IS_ERR(data->clk_master))
clk_enable(data->clk_master);
itype = (enum exynos_sysmmu_inttype)
@ -366,7 +365,6 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
sysmmu_unblock(data->sfrbase);
if (!IS_ERR(data->clk_master))
clk_disable(data->clk_master);
spin_unlock(&data->lock);
@ -376,14 +374,12 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
static void __sysmmu_disable_nocount(struct sysmmu_drvdata *data)
{
if (!IS_ERR(data->clk_master))
clk_enable(data->clk_master);
__raw_writel(CTRL_DISABLE, data->sfrbase + REG_MMU_CTRL);
__raw_writel(0, data->sfrbase + REG_MMU_CFG);
clk_disable(data->clk);
if (!IS_ERR(data->clk_master))
clk_disable(data->clk_master);
}
@ -437,7 +433,6 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data)
static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data)
{
if (!IS_ERR(data->clk_master))
clk_enable(data->clk_master);
clk_enable(data->clk);
@ -449,7 +444,6 @@ static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data)
__raw_writel(CTRL_ENABLE, data->sfrbase + REG_MMU_CTRL);
if (!IS_ERR(data->clk_master))
clk_disable(data->clk_master);
}
@ -493,7 +487,6 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
{
unsigned long flags;
if (!IS_ERR(data->clk_master))
clk_enable(data->clk_master);
spin_lock_irqsave(&data->lock, flags);
@ -501,7 +494,6 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
__sysmmu_tlb_invalidate_flpdcache(data, iova);
spin_unlock_irqrestore(&data->lock, flags);
if (!IS_ERR(data->clk_master))
clk_disable(data->clk_master);
}
@ -514,7 +506,6 @@ static void sysmmu_tlb_invalidate_entry(struct sysmmu_drvdata *data,
if (is_sysmmu_active(data)) {
unsigned int num_inv = 1;
if (!IS_ERR(data->clk_master))
clk_enable(data->clk_master);
/*
@ -535,7 +526,6 @@ static void sysmmu_tlb_invalidate_entry(struct sysmmu_drvdata *data,
data->sfrbase, iova, num_inv);
sysmmu_unblock(data->sfrbase);
}
if (!IS_ERR(data->clk_master))
clk_disable(data->clk_master);
} else {
dev_dbg(data->master,
@ -593,6 +583,8 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev)
dev_err(dev, "Failed to prepare master's clk\n");
return ret;
}
} else {
data->clk_master = NULL;
}
data->sysmmu = dev;