@@ -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);
}
/* -----------------------------------------------------------------------------
@@ -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);
}
@@ -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);
}
@@ -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);
}