Re: [PATCH 4/4] phy: mediatek: phy-mtk-hdmi: Simplify with dev_err_probe()

On Mon, 2022-01-03 at 16:30 +0100, AngeloGioacchino Del Regno wrote:

Use the dev_err_probe() helper to simplify error handling during probe.

Signed-off-by: AngeloGioacchino Del Regno < angelogioacchino.delregno@collabora.com>

---

drivers/phy/mediatek/phy-mtk-hdmi.c | 50 +++++++++++--------------

1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/drivers/phy/mediatek/phy-mtk-hdmi.c b/drivers/phy/mediatek/phy-mtk-hdmi.c index e037fa89696c..4f40a6eea004 100644 --- a/drivers/phy/mediatek/phy-mtk-hdmi.c +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c @@ -104,20 +104,16 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) return PTR_ERR(hdmi_phy->regmap);

ref_clk = devm_clk_get(dev, "pll_ref");

• if (IS_ERR(ref_clk)) {

• ret = PTR_ERR(ref_clk);
  

• dev_err(&pdev->dev, "Failed to get PLL reference clock:
  

%d\n",

• 	ret);
  

• return ret;
  

• }

• if (IS_ERR(ref_clk))

• return dev_err_probe(dev, PTR_ERR(ref_clk),
  

• 		     "Failed to get PLL reference
  

clock\n");

• ref_clk_name = __clk_get_name(ref_clk);

  ret = of_property_read_string(dev->of_node, "clock-output-

names", &clk_init.name);

• if (ret < 0) {

• dev_err(dev, "Failed to read clock-output-names: %d\n",
  

ret);

• return ret;
  

• }

• if (ret < 0)

• return dev_err_probe(dev, ret, "Failed to read clock-
  

output-names\n");

Seems no need change it if no EPROBE_DEFER happens

hdmi_phy->dev = dev; hdmi_phy->conf = @@ -125,25 +121,19 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) mtk_hdmi_phy_clk_get_data(hdmi_phy, &clk_init); hdmi_phy->pll_hw.init = &clk_init; hdmi_phy->pll = devm_clk_register(dev, &hdmi_phy->pll_hw);

• if (IS_ERR(hdmi_phy->pll)) {

• ret = PTR_ERR(hdmi_phy->pll);
  

• dev_err(dev, "Failed to register PLL: %d\n", ret);
  

• return ret;
  

• }

• if (IS_ERR(hdmi_phy->pll))

• return dev_err_probe(dev, PTR_ERR(hdmi_phy->pll),
  

• 		    "Failed to register PLL\n");
  
  

  ret = of_property_read_u32(dev->of_node, "mediatek,ibias", &hdmi_phy->ibias);

• if (ret < 0) {

• dev_err(&pdev->dev, "Failed to get ibias: %d\n", ret);
  

• return ret;
  

• }

• if (ret < 0)

• return dev_err_probe(dev, ret, "Failed to get
  

ibias\n");

ditto

Thanks

ret = of_property_read_u32(dev->of_node, "mediatek,ibias_up", &hdmi_phy->ibias_up);

• if (ret < 0) {

• dev_err(&pdev->dev, "Failed to get ibias up: %d\n",
  

ret);

• return ret;
  

• }

• if (ret < 0)

• return dev_err_probe(dev, ret, "Failed to get
  

ibias_up\n");

dev_info(dev, "Using default TX DRV impedance: 4.2k/36\n"); hdmi_phy->drv_imp_clk = 0x30; @@ -152,17 +142,15 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) hdmi_phy->drv_imp_d0 = 0x30;

phy = devm_phy_create(dev, NULL, mtk_hdmi_phy_dev_get_ops(hdmi_phy));

• if (IS_ERR(phy)) {

• dev_err(dev, "Failed to create HDMI PHY\n");
  

• return PTR_ERR(phy);
  

• }

• if (IS_ERR(phy))

• return dev_err_probe(dev, PTR_ERR(phy), "Cannot create
  

HDMI PHY\n");

• phy_set_drvdata(phy, hdmi_phy);

  phy_provider = devm_of_phy_provider_register(dev,

of_phy_simple_xlate);

• if (IS_ERR(phy_provider)) {

• dev_err(dev, "Failed to register HDMI PHY\n");
  

• return PTR_ERR(phy_provider);
  

• }

• if (IS_ERR(phy_provider))

• return dev_err_probe(dev, PTR_ERR(phy_provider),
  

• 		     "Failed to register HDMI PHY\n");
  
  

  if (hdmi_phy->conf->pll_default_off) hdmi_phy->conf->hdmi_phy_disable_tmds(hdmi_phy);