From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Harini Katakam <harini.katakam@xilinx.com>,
Richard Cochran <richardcochran@gmail.com>,
Russell King <linux@armlinux.org.uk>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Tawfik Bayouk" <tawfik.bayouk@mobileye.com>,
"Théo Lebrun" <theo.lebrun@bootlin.com>,
"Sean Anderson" <sean.anderson@linux.dev>
Subject: [PATCH net v3 10/16] net: macb: Remove local variables clk_init and init in macb_probe()
Date: Fri, 08 Aug 2025 18:52:42 +0200 [thread overview]
Message-ID: <20250808-macb-fixes-v3-10-08f1fcb5179f@bootlin.com> (raw)
In-Reply-To: <20250808-macb-fixes-v3-0-08f1fcb5179f@bootlin.com>
Remove local variables clk_init and init. Those function pointers are
always equivalent to macb_config->clk_init and macb_config->init.
Reviewed-by: Sean Anderson <sean.anderson@linux.dev>
Signed-off-by: Théo Lebrun <theo.lebrun@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 4d8b4b764e0d5768a91f72fb6a5642f755ef3a5b..8c190ed201c1095ecb56749a4cf7f28112ae41d7 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -5182,10 +5182,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;
@@ -5207,14 +5203,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;
@@ -5352,7 +5345,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;
--
2.50.1
next prev parent reply other threads:[~2025-08-08 16:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-08 16:52 [PATCH net v3 00/16] net: macb: various fixes & cleanup Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 01/16] dt-bindings: net: cdns,macb: allow tsu_clk without tx_clk Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 02/16] dt-bindings: net: cdns,macb: sort compatibles Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 03/16] net: macb: remove illusion about TBQPH/RBQPH being per-queue Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 04/16] net: macb: move ring size computation to functions Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 05/16] net: macb: single dma_alloc_coherent() for DMA descriptors Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 06/16] net: macb: match skb_reserve(skb, NET_IP_ALIGN) with HW alignment Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 07/16] net: macb: avoid double endianness swap in macb_set_hwaddr() Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 08/16] net: macb: use BIT() macro for capability definitions Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 09/16] net: macb: remove gap in MACB_CAPS_* flags Théo Lebrun
2025-08-08 16:52 ` Théo Lebrun [this message]
2025-08-08 16:52 ` [PATCH net v3 11/16] net: macb: drop macb_config NULL checking Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 12/16] net: macb: simplify macb_dma_desc_get_size() Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 13/16] net: macb: simplify macb_adj_dma_desc_idx() Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 14/16] net: macb: move bp->hw_dma_cap flags to bp->caps Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 15/16] net: macb: introduce DMA descriptor helpers (is 64bit? is PTP?) Théo Lebrun
2025-08-08 16:52 ` [PATCH net v3 16/16] net: macb: sort #includes Théo Lebrun
2025-08-08 23:06 ` [PATCH net v3 00/16] net: macb: various fixes & cleanup Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250808-macb-fixes-v3-10-08f1fcb5179f@bootlin.com \
--to=theo.lebrun@bootlin.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.beznea@tuxon.dev \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=geert@linux-m68k.org \
--cc=harini.katakam@xilinx.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=sean.anderson@linux.dev \
--cc=tawfik.bayouk@mobileye.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).