iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: intel: Use dev_err_probe() to simplify code

Browse Source 
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.

Signed-off-by: Yuan Can <yuancan@huawei.com>
Link: https://lore.kernel.org/r/20220922111551.37188-1-yuancan@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Yuan Can 2022-09-22 11:15:51 +00:00 committed by Vinod Koul
parent 6177f79644
commit 7706630c56
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/phy/intel/phy-intel-lgm-combo.c
View File

@ -413,44 +413,29 @@ static int intel_cbphy_fwnode_parse(struct intel_combo_phy *cbphy)
u32 val; u32 val;
cbphy->core_clk = devm_clk_get(dev, NULL); cbphy->core_clk = devm_clk_get(dev, NULL);
if (IS_ERR(cbphy->core_clk)) { if (IS_ERR(cbphy->core_clk))
ret = PTR_ERR(cbphy->core_clk); return dev_err_probe(dev, PTR_ERR(cbphy->core_clk),
if (ret != -EPROBE_DEFER) "Get clk failed!\n");
dev_err(dev, "Get clk failed:%d!\n", ret);
return ret;
}
cbphy->core_rst = devm_reset_control_get_optional(dev, "core"); cbphy->core_rst = devm_reset_control_get_optional(dev, "core");
if (IS_ERR(cbphy->core_rst)) { if (IS_ERR(cbphy->core_rst))
ret = PTR_ERR(cbphy->core_rst); return dev_err_probe(dev, PTR_ERR(cbphy->core_rst),
if (ret != -EPROBE_DEFER) "Get core reset control err!\n");
dev_err(dev, "Get core reset control err: %d!\n", ret);
return ret;
}
cbphy->phy_rst = devm_reset_control_get_optional(dev, "phy"); cbphy->phy_rst = devm_reset_control_get_optional(dev, "phy");
if (IS_ERR(cbphy->phy_rst)) { if (IS_ERR(cbphy->phy_rst))
ret = PTR_ERR(cbphy->phy_rst); return dev_err_probe(dev, PTR_ERR(cbphy->phy_rst),
if (ret != -EPROBE_DEFER) "Get PHY reset control err!\n");
dev_err(dev, "Get PHY reset control err: %d!\n", ret);
return ret;
}
cbphy->iphy[0].app_rst = devm_reset_control_get_optional(dev, "iphy0"); cbphy->iphy[0].app_rst = devm_reset_control_get_optional(dev, "iphy0");
if (IS_ERR(cbphy->iphy[0].app_rst)) { if (IS_ERR(cbphy->iphy[0].app_rst))
ret = PTR_ERR(cbphy->iphy[0].app_rst); return dev_err_probe(dev, PTR_ERR(cbphy->iphy[0].app_rst),
if (ret != -EPROBE_DEFER) "Get phy0 reset control err!\n");
dev_err(dev, "Get phy0 reset control err: %d!\n", ret);
return ret;
}
cbphy->iphy[1].app_rst = devm_reset_control_get_optional(dev, "iphy1"); cbphy->iphy[1].app_rst = devm_reset_control_get_optional(dev, "iphy1");
if (IS_ERR(cbphy->iphy[1].app_rst)) { if (IS_ERR(cbphy->iphy[1].app_rst))
ret = PTR_ERR(cbphy->iphy[1].app_rst); return dev_err_probe(dev, PTR_ERR(cbphy->iphy[1].app_rst),
if (ret != -EPROBE_DEFER) "Get phy1 reset control err!\n");
dev_err(dev, "Get phy1 reset control err: %d!\n", ret);
return ret;
}
cbphy->app_base = devm_platform_ioremap_resource_byname(pdev, "app"); cbphy->app_base = devm_platform_ioremap_resource_byname(pdev, "app");
if (IS_ERR(cbphy->app_base)) if (IS_ERR(cbphy->app_base))