net: stmmac: add stmmac_plat_dat_alloc()

Add a function to allocate and initialise the plat_stmmacenet_data
structure with default values.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJviq-0000000EVjP-0c0l@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index b2194e414ec1f6cc69b1129a1040a01eccb72392..7e56fbc3e141ba4fcb862705df6f672fef6685bd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -1286,7 +1286,7 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,
        if (!intel_priv)
                return -ENOMEM;
 
-       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       plat = stmmac_plat_dat_alloc(&pdev->dev);
        if (!plat)
                return -ENOMEM;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index dd2fc39ec3e22597f3d9fb7966b662c1bcc8f058..2d803fa37e212c32d7f553a98adb979395874df1 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -559,7 +559,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
        struct loongson_data *ld;
        int ret;
 
-       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       plat = stmmac_plat_dat_alloc(&pdev->dev);
        if (!plat)
                return -ENOMEM;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 0ea74c88a779ff6677935b6eb8bad8477872028c..e9ed5086c049d2c3020d8aed44b2c8b3c0be7977 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -408,6 +408,8 @@ int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size);
 int stmmac_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
                           phy_interface_t interface, int speed);
 
+struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev);
+
 static inline bool stmmac_xdp_is_enabled(struct stmmac_priv *priv)
 {
        return !!priv->xdp_prog;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d202f604161ef8913274057614ea6b559e2df31a..400b4b9558207e5a5aed537175d29a9dd24255e5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7555,6 +7555,18 @@ static void stmmac_unregister_devlink(struct stmmac_priv *priv)
        devlink_free(priv->devlink);
 }
 
+struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev)
+{
+       struct plat_stmmacenet_data *plat_dat;
+
+       plat_dat = devm_kzalloc(dev, sizeof(*plat_dat), GFP_KERNEL);
+       if (!plat_dat)
+               return NULL;
+
+       return plat_dat;
+}
+EXPORT_SYMBOL_GPL(stmmac_plat_dat_alloc);
+
 /**
  * stmmac_dvr_probe
  * @device: device pointer

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 94b3a3b272706c7ead3d219462ddf5c5b81214d5..622cdbeca20fe7b047d70ce2ffff728198c2c285 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -191,7 +191,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
        int ret;
        int i;
 
-       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       plat = stmmac_plat_dat_alloc(&pdev->dev);
        if (!plat)
                return -ENOMEM;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 6483d52b4c0f514ccebcd5b51227961c8e8a6589..38d574907a044257a5680c5bf5ccc96e2f616f94 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -436,7 +436,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
        void *ret;
        int rc;
 
-       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       plat = stmmac_plat_dat_alloc(&pdev->dev);
        if (!plat)
                return ERR_PTR(-ENOMEM);