Change to use dev_err_probe() to report bind() errors consistently.
Signed-off-by: Jonas Karlman <[email protected]>
---
drivers/gpu/drm/meson/meson_dw_hdmi.c | 65 +++++++++++++--------------
1 file changed, 30 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c
b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index d0cf2042d41c..1dd59196ff7f 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -650,10 +650,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct
device *master,
DRM_DEBUG_DRIVER("\n");
match = of_device_get_match_data(dev);
- if (!match) {
- dev_err(dev, "failed to get match data\n");
- return -ENODEV;
- }
+ if (!match)
+ return dev_err_probe(dev, -ENODEV,
+ "Failed to get match data\n");
meson_dw_hdmi = devm_kzalloc(dev, sizeof(*meson_dw_hdmi),
GFP_KERNEL);
@@ -667,50 +666,45 @@ static int meson_dw_hdmi_bind(struct device *dev, struct
device *master,
ret = devm_regulator_get_enable_optional(dev, "hdmi");
if (ret < 0 && ret != -ENODEV)
- return ret;
+ return dev_err_probe(dev, ret,
+ "Failed to get/enable hdmi regulator\n");
meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev,
"hdmitx_apb");
- if (IS_ERR(meson_dw_hdmi->hdmitx_apb)) {
- dev_err(dev, "Failed to get hdmitx_apb reset\n");
- return PTR_ERR(meson_dw_hdmi->hdmitx_apb);
- }
+ if (IS_ERR(meson_dw_hdmi->hdmitx_apb))
+ return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->hdmitx_apb),
+ "Failed to get hdmitx_apb reset\n");
meson_dw_hdmi->hdmitx_ctrl = devm_reset_control_get_exclusive(dev,
"hdmitx");
- if (IS_ERR(meson_dw_hdmi->hdmitx_ctrl)) {
- dev_err(dev, "Failed to get hdmitx reset\n");
- return PTR_ERR(meson_dw_hdmi->hdmitx_ctrl);
- }
+ if (IS_ERR(meson_dw_hdmi->hdmitx_ctrl))
+ return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->hdmitx_ctrl),
+ "Failed to get hdmitx reset\n");
meson_dw_hdmi->hdmitx_phy = devm_reset_control_get_exclusive(dev,
"hdmitx_phy");
- if (IS_ERR(meson_dw_hdmi->hdmitx_phy)) {
- dev_err(dev, "Failed to get hdmitx_phy reset\n");
- return PTR_ERR(meson_dw_hdmi->hdmitx_phy);
- }
+ if (IS_ERR(meson_dw_hdmi->hdmitx_phy))
+ return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->hdmitx_phy),
+ "Failed to get hdmitx_phy reset\n");
meson_dw_hdmi->hdmitx = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(meson_dw_hdmi->hdmitx))
return PTR_ERR(meson_dw_hdmi->hdmitx);
clk = devm_clk_get_enabled(dev, "isfr");
- if (IS_ERR(clk)) {
- dev_err(dev, "Unable to get isfr pclk\n");
- return PTR_ERR(clk);
- }
+ if (IS_ERR(clk))
+ return dev_err_probe(dev, PTR_ERR(clk),
+ "Failed to get isfr pclk\n");
clk = devm_clk_get_enabled(dev, "iahb");
- if (IS_ERR(clk)) {
- dev_err(dev, "Unable to get iahb pclk\n");
- return PTR_ERR(clk);
- }
+ if (IS_ERR(clk))
+ return dev_err_probe(dev, PTR_ERR(clk),
+ "Failed to get iahb pclk\n");
clk = devm_clk_get_enabled(dev, "venci");
- if (IS_ERR(clk)) {
- dev_err(dev, "Unable to get venci pclk\n");
- return PTR_ERR(clk);
- }
+ if (IS_ERR(clk))
+ return dev_err_probe(dev, PTR_ERR(clk),
+ "Failed to get venci pclk\n");
dw_plat_data->regm = devm_regmap_init(dev, NULL, meson_dw_hdmi,
&meson_dw_hdmi_regmap_config);
@@ -724,10 +718,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct
device *master,
ret = devm_request_threaded_irq(dev, irq, dw_hdmi_top_irq,
dw_hdmi_top_thread_irq, IRQF_SHARED,
"dw_hdmi_top_irq", meson_dw_hdmi);
- if (ret) {
- dev_err(dev, "Failed to request hdmi top irq\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "Failed to request hdmi top irq\n");
meson_dw_hdmi_init(meson_dw_hdmi);
@@ -752,14 +745,16 @@ static int meson_dw_hdmi_bind(struct device *dev, struct
device *master,
meson_dw_hdmi->hdmi = dw_hdmi_probe(pdev, &meson_dw_hdmi->dw_plat_data);
if (IS_ERR(meson_dw_hdmi->hdmi)) {
devm_free_irq(dev, irq, meson_dw_hdmi);
- return PTR_ERR(meson_dw_hdmi->hdmi);
+ return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->hdmi),
+ "Failed to probe dw-hdmi bridge\n");
}
meson_dw_hdmi->bridge = of_drm_find_and_get_bridge(dev->of_node);
if (!meson_dw_hdmi->bridge) {
devm_free_irq(dev, irq, meson_dw_hdmi);
dw_hdmi_remove(meson_dw_hdmi->hdmi);
- return -ENODEV;
+ return dev_err_probe(dev, -ENODEV,
+ "Failed to find dw-hdmi bridge\n");
}
DRM_DEBUG_DRIVER("HDMI controller initialized\n");
--
2.54.0
