From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE45327816A for ; Tue, 1 Jul 2025 15:36:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751384165; cv=none; b=MfQNSAYC6b3VPdko/TcnbIJH2BKUz6jqwd+/cu9EhwkPsaFNkZKGKLepiEOKqgNPsoTeQdauqYD+0UebQXpLfCNsf7GC//MNPG+eL3rmhkcDLVO7qfoZb8oAWyaAkgJ1CogyKPBxHZ2DXBskys1a0ZXGBGUKqpt0OTBP8SWOt0U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751384165; c=relaxed/simple; bh=JBVD1eHnNt7/17hJkw9DIm/ja1qq5YSgSfmECmYFLzE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=AJ6Vbhn69qFoDgpfXJlh/szuETcAplfwq7s1DPZGQA+dZsAhFWIDTw7VyZF9b7WHgd1TQ9hTK0QN4fJtnT7puQvIxgWOOcIxfRdOx9Kn+9P9/SjYp8PKGWdPlf4iv45F3HhtqQ8SFehHGEOUIrMMBmcCJMz1/H/93BPrPhlYdwo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=fwBE/RaN; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="fwBE/RaN" Message-ID: <1a4afc5b-4418-4dc1-8779-b9d999f8022f@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751384160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wCxKnSswnNtpFGvtkXVBmSxifi7UjWwGEwVedZPlbCM=; b=fwBE/RaNY/JxaBidGlMSzanuOo6Pzf7xVEkWcviwChwDS/G+6I+EFkG6H0+T50EDv3gjGv IkBa9ZzIUZJI4vL1XHDE4iLlR/Ssszp163h/q6XXdQjdU9FapdalrcSshXefzgctZRvX8d g2hTUfDK8UkDL7ieiT8vj5oeVYgzuk8= Date: Tue, 1 Jul 2025 11:35:53 -0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH net-next v2 06/18] net: macb: Remove local variables clk_init and init in macb_probe() To: =?UTF-8?Q?Th=C3=A9o_Lebrun?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nicolas Ferre , Claudiu Beznea , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Samuel Holland , Richard Cochran , Russell King , Thomas Bogendoerfer , Vladimir Kondratiev , Gregory CLEMENT , Cyrille Pitchen , Harini Katakam , Rafal Ozieblo , Haavard Skinnemoen , Jeff Garzik Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mips@vger.kernel.org, Thomas Petazzoni , Tawfik Bayouk References: <20250627-macb-v2-0-ff8207d0bb77@bootlin.com> <20250627-macb-v2-6-ff8207d0bb77@bootlin.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: <20250627-macb-v2-6-ff8207d0bb77@bootlin.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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 > --- > 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