Skip to content

Commit

Permalink
phy: mediatek: phy-mtk-mipi-dsi: Simplify with dev_err_probe()
Browse files Browse the repository at this point in the history
Use the dev_err_probe() helper to simplify error handling during probe.

Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Vinod Koul <[email protected]>
  • Loading branch information
AngeloGioacchino Del Regno authored and vinodkoul committed Apr 13, 2022
1 parent 09cc358 commit b7b930f
Showing 1 changed file with 10 additions and 19 deletions.
29 changes: 10 additions & 19 deletions drivers/phy/mediatek/phy-mtk-mipi-dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,9 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
return PTR_ERR(mipi_tx->regs);

ref_clk = devm_clk_get(dev, NULL);
if (IS_ERR(ref_clk)) {
ret = PTR_ERR(ref_clk);
dev_err(dev, "Failed to get reference clock: %d\n", ret);
return ret;
}
if (IS_ERR(ref_clk))
return dev_err_probe(dev, PTR_ERR(ref_clk),
"Failed to get reference clock\n");

ret = of_property_read_u32(dev->of_node, "drive-strength-microamp",
&mipi_tx->mipitx_drive);
Expand All @@ -178,27 +176,20 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)

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");

clk_init.ops = mipi_tx->driver_data->mipi_tx_clk_ops;

mipi_tx->pll_hw.init = &clk_init;
mipi_tx->pll = devm_clk_register(dev, &mipi_tx->pll_hw);
if (IS_ERR(mipi_tx->pll)) {
ret = PTR_ERR(mipi_tx->pll);
dev_err(dev, "Failed to register PLL: %d\n", ret);
return ret;
}
if (IS_ERR(mipi_tx->pll))
return dev_err_probe(dev, PTR_ERR(mipi_tx->pll), "Failed to register PLL\n");

phy = devm_phy_create(dev, NULL, &mtk_mipi_tx_ops);
if (IS_ERR(phy)) {
ret = PTR_ERR(phy);
dev_err(dev, "Failed to create MIPI D-PHY: %d\n", ret);
return ret;
}
if (IS_ERR(phy))
return dev_err_probe(dev, PTR_ERR(phy), "Failed to create MIPI D-PHY\n");

phy_set_drvdata(phy, mipi_tx);

phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
Expand Down

0 comments on commit b7b930f

Please sign in to comment.