net: stmmac: Change first parameter of fix_soc_reset()

In order to use netdev_err() to print message in the callback function of
fix_soc_reset(), change fix_soc_reset() to have "struct stmmac_priv *" as
its first parameter.

This is preparation for later patch, no functionality change.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Link: https://patch.msgid.link/20250811073506.27513-3-yangtiezhu@loongson.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index 889e2bb6f7f5d1b58c0cc9749aa1dad0d3b88f6b..c2d9e89f0063b589315efa2c3a340794d29033d1 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -49,7 +49,7 @@ struct imx_dwmac_ops {
        u32 flags;
        bool mac_rgmii_txclk_auto_adj;
 
-       int (*fix_soc_reset)(void *priv, void __iomem *ioaddr);
+       int (*fix_soc_reset)(struct stmmac_priv *priv, void __iomem *ioaddr);
        int (*set_intf_mode)(struct plat_stmmacenet_data *plat_dat);
        void (*fix_mac_speed)(void *priv, int speed, unsigned int mode);
 };
@@ -265,9 +265,9 @@ static void imx93_dwmac_fix_speed(void *priv, int speed, unsigned int mode)
        writel(old_ctrl, dwmac->base_addr + MAC_CTRL_REG);
 }
 
-static int imx_dwmac_mx93_reset(void *priv, void __iomem *ioaddr)
+static int imx_dwmac_mx93_reset(struct stmmac_priv *priv, void __iomem *ioaddr)
 {
-       struct plat_stmmacenet_data *plat_dat = priv;
+       struct plat_stmmacenet_data *plat_dat = priv->plat;
        u32 value = readl(ioaddr + DMA_BUS_MODE);
 
        /* DMA SW reset */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 5769165ee5ba7336b4b2adfc9d1293efd7df55cd..4c477d6ce1e61805117f0ab6905c776b03fc1410 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -509,7 +509,7 @@ static int loongson_dwmac_acpi_config(struct pci_dev *pdev,
 }
 
 /* Loongson's DWMAC device may take nearly two seconds to complete DMA reset */
-static int loongson_dwmac_fix_reset(void *priv, void __iomem *ioaddr)
+static int loongson_dwmac_fix_reset(struct stmmac_priv *priv, void __iomem *ioaddr)
 {
        u32 value = readl(ioaddr + DMA_BUS_MODE);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 99635b37044a9295e5e11590d4e1afaaef5139e5..3f7c765dcb7971a49897f4bc79472b0f7121ca77 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -100,7 +100,7 @@ int stmmac_reset(struct stmmac_priv *priv, void __iomem *ioaddr)
                return -EINVAL;
 
        if (plat && plat->fix_soc_reset)
-               return plat->fix_soc_reset(plat, ioaddr);
+               return plat->fix_soc_reset(priv, ioaddr);
 
        return stmmac_do_callback(priv, dma, reset, ioaddr);
 }

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 22c24dacbc6519bc82c009f3adeb54cf3739394d..e284f04964bf67782893afd6ec57c3907d229cc0 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -238,7 +238,7 @@ struct plat_stmmacenet_data {
        int (*set_clk_tx_rate)(void *priv, struct clk *clk_tx_i,
                               phy_interface_t interface, int speed);
        void (*fix_mac_speed)(void *priv, int speed, unsigned int mode);
-       int (*fix_soc_reset)(void *priv, void __iomem *ioaddr);
+       int (*fix_soc_reset)(struct stmmac_priv *priv, void __iomem *ioaddr);
        int (*serdes_powerup)(struct net_device *ndev, void *priv);
        void (*serdes_powerdown)(struct net_device *ndev, void *priv);
        int (*mac_finish)(struct net_device *ndev,