diff mbox series

[net-next] net: stmmac: platform: use optional clk/reset get APIs

Message ID 20201109160855.24e911b6@xhacker.debian (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: stmmac: platform: use optional clk/reset get APIs | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net-next
netdev/subject_prefix success Link
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch warning WARNING: line length of 93 exceeds 80 columns
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Jisheng Zhang Nov. 9, 2020, 8:09 a.m. UTC
Use the devm_reset_control_get_optional() and devm_clk_get_optional()
rather than open coding them.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 .../ethernet/stmicro/stmmac/stmmac_platform.c | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Comments

Jakub Kicinski Nov. 9, 2020, 7:57 p.m. UTC | #1
On Mon, 9 Nov 2020 16:09:10 +0800 Jisheng Zhang wrote:
> @@ -596,14 +595,10 @@ 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);

This code was wrapped at 80 chars, please keep it wrapped.
Jisheng Zhang Nov. 11, 2020, 2:10 a.m. UTC | #2
On Mon, 9 Nov 2020 11:57:13 -0800 Jakub Kicinski wrote:


> 
> 
> On Mon, 9 Nov 2020 16:09:10 +0800 Jisheng Zhang wrote:
> > @@ -596,14 +595,10 @@ 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);  
> 
> This code was wrapped at 80 chars, please keep it wrapped.
> 

I tried to keep wrapped, since s/devm_reset_control_get/devm_reset_control_get_optional,
to match alignment at open parenthesis on the second line, the
"STMMAC_RESOURCE_NAME" will exceed 80 chars. How to handle this situation?

Thanks in advance
Jakub Kicinski Nov. 11, 2020, 4:22 p.m. UTC | #3
On Wed, 11 Nov 2020 10:10:33 +0800 Jisheng Zhang wrote:
> On Mon, 9 Nov 2020 11:57:13 -0800 Jakub Kicinski wrote:
> > On Mon, 9 Nov 2020 16:09:10 +0800 Jisheng Zhang wrote:  
> > > @@ -596,14 +595,10 @@ 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);    
> > 
> > This code was wrapped at 80 chars, please keep it wrapped.
> >   
> 
> I tried to keep wrapped, since s/devm_reset_control_get/devm_reset_control_get_optional,
> to match alignment at open parenthesis on the second line, the
> "STMMAC_RESOURCE_NAME" will exceed 80 chars. How to handle this situation?

Indeed, it's 81 chars. Still one character over 80 is easier to read
than when STMMAC_RESOURCE_NAME is wrapped half way through the name.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index af34a4cadbb0..f1d5b2ce1039 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -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,10 @@  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 +608,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;
 }
 
 /**