Merge tag 'pm-6.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / iommu / exynos-iommu.c

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 1abd187c6075e4bedce585fd6c4c24794f1b0e84..c275fe71c4db32623f7794728a82696fff8c9c86 100644 (file)
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -747,22 +747,16 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
                return ret;
        }
 
-       data->clk = devm_clk_get(dev, "sysmmu");
-       if (PTR_ERR(data->clk) == -ENOENT)
-               data->clk = NULL;
-       else if (IS_ERR(data->clk))
+       data->clk = devm_clk_get_optional(dev, "sysmmu");
+       if (IS_ERR(data->clk))
                return PTR_ERR(data->clk);
 
-       data->aclk = devm_clk_get(dev, "aclk");
-       if (PTR_ERR(data->aclk) == -ENOENT)
-               data->aclk = NULL;
-       else if (IS_ERR(data->aclk))
+       data->aclk = devm_clk_get_optional(dev, "aclk");
+       if (IS_ERR(data->aclk))
                return PTR_ERR(data->aclk);
 
-       data->pclk = devm_clk_get(dev, "pclk");
-       if (PTR_ERR(data->pclk) == -ENOENT)
-               data->pclk = NULL;
-       else if (IS_ERR(data->pclk))
+       data->pclk = devm_clk_get_optional(dev, "pclk");
+       if (IS_ERR(data->pclk))
                return PTR_ERR(data->pclk);
 
        if (!data->clk && (!data->aclk || !data->pclk)) {
@@ -770,10 +764,8 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
                return -ENOSYS;
        }
 
-       data->clk_master = devm_clk_get(dev, "master");
-       if (PTR_ERR(data->clk_master) == -ENOENT)
-               data->clk_master = NULL;
-       else if (IS_ERR(data->clk_master))
+       data->clk_master = devm_clk_get_optional(dev, "master");
+       if (IS_ERR(data->clk_master))
                return PTR_ERR(data->clk_master);
 
        data->sysmmu = dev;