net: stmmac: platform: use optional clk/reset get APIs
Subsystems (4)
PATCH v2 1/1 net: stmmac: platform: use optional clk/reset get APIs
Use the devm_reset_control_get_optional() and devm_clk_get_optional() rather than open coding them.
Signed-off-by Jisheng Zhang <[email protected]>
---
Since v1:
- keep wrapped as suggested by Jakub
.../ethernet/stmicro/stmmac/stmmac_platform.c | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +9 -13
@@ -399,6 +399,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)struct device_node *np = pdev->dev.of_node;struct plat_stmmacenet_data *plat;struct stmmac_dma_cfg *dma_cfg; +void *ret;int rc; plat =devm_kzalloc (&pdev->dev,sizeof (*plat),GFP_KERNEL );
@@ -576,12 +577,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)clk_prepare_enable (plat->stmmac_clk); } - plat->pclk =devm_clk_get (&pdev->dev,"pclk" ); + plat->pclk =devm_clk_get_optional (&pdev->dev,"pclk" );if (IS_ERR (plat->pclk)) { -if (PTR_ERR (plat->pclk) == -EPROBE_DEFER ) - goto error_pclk_get; - - plat->pclk =NULL ; + ret = plat->pclk; + goto error_pclk_get; }clk_prepare_enable (plat->pclk);
@@ -596,14 +595,11 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)dev_dbg (&pdev->dev,"PTP rate %d\n" , plat->clk_ptp_rate); } - plat->stmmac_rst =devm_reset_control_get (&pdev->dev, -STMMAC_RESOURCE_NAME ); + plat->stmmac_rst =devm_reset_control_get_optional (&pdev->dev, +STMMAC_RESOURCE_NAME );if (IS_ERR (plat->stmmac_rst)) { -if (PTR_ERR (plat->stmmac_rst) == -EPROBE_DEFER ) - goto error_hw_init; - -dev_info (&pdev->dev,"no reset control found\n" ); - plat->stmmac_rst =NULL ; + ret = plat->stmmac_rst; + goto error_hw_init; }return plat;
@@ -613,7 +609,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) error_pclk_get:clk_disable_unprepare (plat->stmmac_clk); -return ERR_PTR (-EPROBE_DEFER ); +return ret; }/**
Signature · 7 lines
2.29.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Thu, 12 Nov 2020 09:27:37 +0800 you wrote:
Use the
devm_reset_control_get_optional()anddevm_clk_get_optional()rather than open coding them.Signed-off-by Jisheng Zhang <[email protected]>---
Since v1:
- keep wrapped as suggested by Jakub[...]
Here is the summary with links:
- [v2,net-next] net: stmmac: platform: use optional clk/reset get APIs
https://git.kernel.org/netdev/net-next/c/bb3222f71b57
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html