3 files changed, 9 insertions, 11 deletions

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 656b2e3334a6..d365c6dff0fb 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -764,11 +764,9 @@ static int tegra_dc_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        dc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-        if (!dc->regs) {
-                dev_err(&pdev->dev, "failed to remap registers\n");
-                return -ENXIO;
-        }
+        dc->regs = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(dc->regs))
+                return PTR_ERR(dc->regs);
 
         dc->irq = platform_get_irq(pdev, 0);
         if (dc->irq < 0) {
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index e060c7e6434d..266af7879240 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1259,9 +1259,9 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
         if (!regs)
                 return -ENXIO;
 
-        hdmi->regs = devm_request_and_ioremap(&pdev->dev, regs);
-        if (!hdmi->regs)
-                return -EADDRNOTAVAIL;
+        hdmi->regs = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(hdmi->regs))
+                return PTR_ERR(hdmi->regs);
 
         err = platform_get_irq(pdev, 0);
         if (err < 0)
diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/drm/tegra/host1x.c
index 5d17b113a6fc..92e25a7e00ea 100644
--- a/drivers/gpu/drm/tegra/host1x.c
+++ b/drivers/gpu/drm/tegra/host1x.c
@@ -139,9 +139,9 @@ static int tegra_host1x_probe(struct platform_device *pdev)
 
         host1x->irq = err;
 
-        host1x->regs = devm_request_and_ioremap(&pdev->dev, regs);
-        if (!host1x->regs) {
-                err = -EADDRNOTAVAIL;
+        host1x->regs = devm_ioremap_resource(&pdev->dev, regs);
+        if (IS_ERR(host1x->regs)) {
+                err = PTR_ERR(host1x->regs);
                 goto err;
         }