[PATCH net-next v2 06/18] net: macb: Remove local variables clk_init and init in macb_probe()

[Sean Anderson]

On 6/27/25 05:08, Théo Lebrun wrote:
> Remove local variables clk_init and init. Those function pointers are
> always equivalent to macb_config->clk_init and macb_config->init.
> 
> Signed-off-by: Théo Lebrun <theo.lebrun at bootlin.com>
> ---
>  drivers/net/ethernet/cadence/macb_main.c | 13 +++----------
>  1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index 53aaf6b08e39a45bde5af61a05fb2b9fd653b2e7..6c8a34e40b77ea37ed25c2b0414440cd3f6962c3 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -5166,10 +5166,6 @@ static const struct macb_config default_gem_config = {
>  static int macb_probe(struct platform_device *pdev)
>  {
>  	const struct macb_config *macb_config = &default_gem_config;
> -	int (*clk_init)(struct platform_device *, struct clk **,
> -			struct clk **, struct clk **,  struct clk **,
> -			struct clk **) = macb_config->clk_init;
> -	int (*init)(struct platform_device *) = macb_config->init;
>  	struct device_node *np = pdev->dev.of_node;
>  	struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
>  	struct clk *tsu_clk = NULL;
> @@ -5191,14 +5187,11 @@ static int macb_probe(struct platform_device *pdev)
>  		const struct of_device_id *match;
>  
>  		match = of_match_node(macb_dt_ids, np);
> -		if (match && match->data) {
> +		if (match && match->data)
>  			macb_config = match->data;
> -			clk_init = macb_config->clk_init;
> -			init = macb_config->init;
> -		}
>  	}
>  
> -	err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk);
> +	err = macb_config->clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk);
>  	if (err)
>  		return err;
>  
> @@ -5336,7 +5329,7 @@ static int macb_probe(struct platform_device *pdev)
>  		bp->phy_interface = interface;
>  
>  	/* IP specific init */
> -	err = init(pdev);
> +	err = macb_config->init(pdev);
>  	if (err)
>  		goto err_out_free_netdev;
>  
> 

Reviewed-by: Sean Anderson <sean.anderson at linux.dev>