mm/migrate: correct failure handling if !hugepage_migration_support()

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / msm_iommu_dev.c

diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c
index 6ba3514771322a387d864582e326a947361f655f..08ba4972da9d2543a8ec9ad9f312451647bcd1e9 100644 (file)
--- a/drivers/iommu/msm_iommu_dev.c
+++ b/drivers/iommu/msm_iommu_dev.c
@@ -27,8 +27,8 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 
-#include <mach/iommu_hw-8xxx.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-8xxx.h"
+#include "msm_iommu.h"
 
 struct iommu_ctx_iter_data {
        /* input */
@@ -282,7 +282,6 @@ static int msm_iommu_remove(struct platform_device *pdev)
                clk_put(drv->pclk);
                memset(drv, 0, sizeof(*drv));
                kfree(drv);
-               platform_set_drvdata(pdev, NULL);
        }
        return 0;
 }
@@ -366,7 +365,6 @@ static int msm_iommu_ctx_remove(struct platform_device *pdev)
        if (drv) {
                memset(drv, 0, sizeof(struct msm_iommu_ctx_drvdata));
                kfree(drv);
-               platform_set_drvdata(pdev, NULL);
        }
        return 0;
 }