drm/msm/phy/dsi_phy: silence -EPROBE_DEFER warnings
PATCH 1/1 drm/msm/phy/dsi_phy: silence -EPROBE_DEFER warnings
The following errors show up when booting the Nexus 5:
msm_dsi_phy fd922a00.dsi-phy: [drm:dsi_phy_driver_probe] *ERROR*
dsi_phy_regulator_init: failed to init regulator, ret=-517msm_dsi_phy fd922a00.dsi-phy: [drm:dsi_phy_driver_probe] *ERROR*
dsi_phy_driver_probe: failed to init regulator
dsi_phy_regulator_init() already logs the error, so no need to log the same error a second time in dsi_phy_driver_probe(). This patch also changes dsi_phy_regulator_init() to not log the error if the error code is -EPROBE_DEFER to reduce noise in dmesg.
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +6 -5
@@ -396,8 +396,11 @@ static int dsi_phy_regulator_init(struct msm_dsi_phy *phy) ret =devm_regulator_bulk_get (dev, num, s);if (ret <0 ) { -DRM_DEV_ERROR (dev,"%s: failed to init regulator, ret=%d\n" , - __func__, ret); +if (ret != -EPROBE_DEFER ) +DRM_DEV_ERROR (dev, +"%s: failed to init regulator, ret=%d\n" , + __func__, ret); +return ret; }
@@ -584,10 +587,8 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) } ret =dsi_phy_regulator_init (phy); -if (ret) { -DRM_DEV_ERROR (dev,"%s: failed to init regulator\n" , __func__); +if (ret) goto fail; - } phy->ahb_clk =msm_clk_get (pdev,"iface" );if (IS_ERR (phy->ahb_clk)) {
Signature · 1 line
2.20.1
Quoted 22 lines · Brian Masney
The following errors show up when booting the Nexus 5:
msm_dsi_phyfd922a00.dsi-phy: [drm:dsi_phy_driver_probe] *ERROR*
dsi_phy_regulator_init: failed to init regulator, ret=-517msm_dsi_phyfd922a00.dsi-phy: [drm:dsi_phy_driver_probe] *ERROR*
dsi_phy_driver_probe: failed to init regulator
dsi_phy_regulator_init()already logs the error, so no need to log the same error a second time indsi_phy_driver_probe(). This patch also changesdsi_phy_regulator_init()to not log the error if the error code is -EPROBE_DEFER to reduce noise in dmesg.Signed-off-by Brian Masney <[email protected]>--- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +0
-0
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c static int dsi_phy_regulator_init(struct msm_dsi_phy *phy) · line 402
Quoted 9 lines
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +4
-2@@ -396,8 +396,11 @@ static int dsi_phy_regulator_init(struct msm_dsi_phy *phy) ret =devm_regulator_bulk_get (dev, num, s);if (ret <0 ) { -DRM_DEV_ERROR (dev,"%s: failed to init regulator, ret=%d\n" , - __func__, ret); +if (ret != -EPROBE_DEFER ) +DRM_DEV_ERROR (dev, +"%s: failed to init regulator, ret=%d\n" , + __func__, ret);
Some {} wouldn't hurt here, but not a big deal.
Quoted 19 lines
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +2
-3+return ret; }@@ -584,10 +587,8 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) } ret =dsi_phy_regulator_init (phy); -if (ret) { -DRM_DEV_ERROR (dev,"%s: failed to init regulator\n" , __func__); +if (ret) goto fail; - } phy->ahb_clk =msm_clk_get (pdev,"iface" );if (IS_ERR (phy->ahb_clk)) {Signature · 1 line
2.20.1