1 files changed, 6 insertions, 21 deletions

diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index 108c0e9c24d9..dba1a9fd5070 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -252,7 +252,7 @@ static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova,
         spin_lock_irqsave(&gart->pte_lock, flags);
         pfn = __phys_to_pfn(pa);
         if (!pfn_valid(pfn)) {
-                dev_err(gart->dev, "Invalid page: %08x\n", pa);
+                dev_err(gart->dev, "Invalid page: %pa\n", &pa);
                 spin_unlock_irqrestore(&gart->pte_lock, flags);
                 return -EINVAL;
         }
@@ -295,8 +295,8 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain,
 
         pa = (pte & GART_PAGE_MASK);
         if (!pfn_valid(__phys_to_pfn(pa))) {
-                dev_err(gart->dev, "No entry for %08llx:%08x\n",
-                         (unsigned long long)iova, pa);
+                dev_err(gart->dev, "No entry for %08llx:%pa\n",
+                         (unsigned long long)iova, &pa);
                 gart_dump_table(gart);
                 return -EINVAL;
         }
@@ -351,7 +351,6 @@ static int tegra_gart_probe(struct platform_device *pdev)
         struct gart_device *gart;
         struct resource *res, *res_remap;
         void __iomem *gart_regs;
-        int err;
         struct device *dev = &pdev->dev;
 
         if (gart_handle)
@@ -376,8 +375,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
         gart_regs = devm_ioremap(dev, res->start, resource_size(res));
         if (!gart_regs) {
                 dev_err(dev, "failed to remap GART registers\n");
-                err = -ENXIO;
-                goto fail;
+                return -ENXIO;
         }
 
         gart->dev = &pdev->dev;
@@ -391,8 +389,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
         gart->savedata = vmalloc(sizeof(u32) * gart->page_count);
         if (!gart->savedata) {
                 dev_err(dev, "failed to allocate context save area\n");
-                err = -ENOMEM;
-                goto fail;
+                return -ENOMEM;
         }
 
         platform_set_drvdata(pdev, gart);
@@ -401,32 +398,20 @@ static int tegra_gart_probe(struct platform_device *pdev)
         gart_handle = gart;
         bus_set_iommu(&platform_bus_type, &gart_iommu_ops);
         return 0;
-
-fail:
-        if (gart_regs)
-                devm_iounmap(dev, gart_regs);
-        if (gart && gart->savedata)
-                vfree(gart->savedata);
-        devm_kfree(dev, gart);
-        return err;
 }
 
 static int tegra_gart_remove(struct platform_device *pdev)
 {
         struct gart_device *gart = platform_get_drvdata(pdev);
-        struct device *dev = gart->dev;
 
         writel(0, gart->regs + GART_CONFIG);
         if (gart->savedata)
                 vfree(gart->savedata);
-        if (gart->regs)
-                devm_iounmap(dev, gart->regs);
-        devm_kfree(dev, gart);
         gart_handle = NULL;
         return 0;
 }
 
-const struct dev_pm_ops tegra_gart_pm_ops = {
+static const struct dev_pm_ops tegra_gart_pm_ops = {
         .suspend        = tegra_gart_suspend,
         .resume         = tegra_gart_resume,
 };