ipmi: Report an error if ACPI _IFT doesn't exist

[cascardo/linux.git] / drivers / iommu / msm_iommu_dev.c

diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c
index 61def7c..b6d01f9 100644 (file)
--- a/drivers/iommu/msm_iommu_dev.c
+++ b/drivers/iommu/msm_iommu_dev.c
@@ -131,7 +131,7 @@ static int msm_iommu_probe(struct platform_device *pdev)
        struct clk *iommu_clk;
        struct clk *iommu_pclk;
        struct msm_iommu_drvdata *drvdata;
-       struct msm_iommu_dev *iommu_dev = pdev->dev.platform_data;
+       struct msm_iommu_dev *iommu_dev = dev_get_platdata(&pdev->dev);
        void __iomem *regs_base;
        int ret, irq, par;
 
@@ -224,8 +224,7 @@ static int msm_iommu_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, drvdata);
 
-       if (iommu_clk)
-               clk_disable(iommu_clk);
+       clk_disable(iommu_clk);
 
        clk_disable(iommu_pclk);
 
@@ -264,7 +263,7 @@ static int msm_iommu_remove(struct platform_device *pdev)
 
 static int msm_iommu_ctx_probe(struct platform_device *pdev)
 {
-       struct msm_iommu_ctx_dev *c = pdev->dev.platform_data;
+       struct msm_iommu_ctx_dev *c = dev_get_platdata(&pdev->dev);
        struct msm_iommu_drvdata *drvdata;
        struct msm_iommu_ctx_drvdata *ctx_drvdata;
        int i, ret;
@@ -323,8 +322,7 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev)
                SET_NSCFG(drvdata->base, mid, 3);
        }
 
-       if (drvdata->clk)
-               clk_disable(drvdata->clk);
+       clk_disable(drvdata->clk);
        clk_disable(drvdata->pclk);
 
        dev_info(&pdev->dev, "context %s using bank %d\n", c->name, c->num);