Commit bb3222f7 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Jakub Kicinski

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: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/20201112092606.5173aa6f@xhacker.debianSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ca1ab89c
...@@ -399,6 +399,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) ...@@ -399,6 +399,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct plat_stmmacenet_data *plat; struct plat_stmmacenet_data *plat;
struct stmmac_dma_cfg *dma_cfg; struct stmmac_dma_cfg *dma_cfg;
void *ret;
int rc; int rc;
plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
...@@ -576,12 +577,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) ...@@ -576,12 +577,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
clk_prepare_enable(plat->stmmac_clk); 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 (IS_ERR(plat->pclk)) {
if (PTR_ERR(plat->pclk) == -EPROBE_DEFER) ret = plat->pclk;
goto error_pclk_get; goto error_pclk_get;
plat->pclk = NULL;
} }
clk_prepare_enable(plat->pclk); clk_prepare_enable(plat->pclk);
...@@ -596,14 +595,11 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) ...@@ -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); dev_dbg(&pdev->dev, "PTP rate %d\n", plat->clk_ptp_rate);
} }
plat->stmmac_rst = devm_reset_control_get(&pdev->dev, plat->stmmac_rst = devm_reset_control_get_optional(&pdev->dev,
STMMAC_RESOURCE_NAME); STMMAC_RESOURCE_NAME);
if (IS_ERR(plat->stmmac_rst)) { if (IS_ERR(plat->stmmac_rst)) {
if (PTR_ERR(plat->stmmac_rst) == -EPROBE_DEFER) ret = plat->stmmac_rst;
goto error_hw_init; goto error_hw_init;
dev_info(&pdev->dev, "no reset control found\n");
plat->stmmac_rst = NULL;
} }
return plat; return plat;
...@@ -613,7 +609,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) ...@@ -613,7 +609,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
error_pclk_get: error_pclk_get:
clk_disable_unprepare(plat->stmmac_clk); clk_disable_unprepare(plat->stmmac_clk);
return ERR_PTR(-EPROBE_DEFER); return ret;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment