Skip to contentSkip to conversation

omapdrm/dss: Use PTR_ERR_OR_ZERO() in four functions

PATCH New Markus Elfring 1 participant 1 message Sep 6, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omapdrm/dss: Use PTR_ERR_OR_ZERO() in four functions

From: Markus Elfring <[email protected]>
Date: Fri, 6 Sep 2019 18:40:48 +0200

Simplify these function implementations by using a known function.

This issue was detected by using the Coccinelle software.

---
 drivers/gpu/drm/omapdrm/dss/hdmi4.c      | 6 +-----
 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 4 +---
 drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 +---
 drivers/gpu/drm/omapdrm/dss/hdmi_phy.c   | 4 +---
 4 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/omapdrm/dss/hdmi4.c +1 -5
index 0f557fad4513..b1a8d4bfbe48 100644
@@ -586,11 +586,7 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
 	hdmi->audio_pdev = platform_device_register_data(
 		&hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
 		&pdata, sizeof(pdata));
-
-	if (IS_ERR(hdmi->audio_pdev))
-		return PTR_ERR(hdmi->audio_pdev);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(hdmi->audio_pdev);
 }
 
 /* -----------------------------------------------------------------------------
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +1 -3
index 5d5d5588ebc1..0775109133b5 100644
@@ -923,8 +923,6 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
 	core->base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(core->base))
-		return PTR_ERR(core->base);
 
-	return 0;
+	return PTR_ERR_OR_ZERO(core->base);
 }
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c +1 -3
index 7400fb99d453..655cf2048809 100644
@@ -899,8 +899,6 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
 	core->base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(core->base))
-		return PTR_ERR(core->base);
 
-	return 0;
+	return PTR_ERR_OR_ZERO(core->base);
 }
drivers/gpu/drm/omapdrm/dss/hdmi_phy.c +1 -3
index 00bbf24488c1..bbc02d5aa8fb 100644
@@ -191,8 +191,6 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy,
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
 	phy->base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(phy->base))
-		return PTR_ERR(phy->base);
 
-	return 0;
+	return PTR_ERR_OR_ZERO(phy->base);
 }

--
2.23.0