Commit d6e1f227 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: mediatek: convert to resume() method 



Convert mediatek to use the resume() platform method rather than the
init() platform method as mediatek_dwmac_init() is only called from
the resume paths.

This will ensure that in a future commit, mediatek_dwmac_init() won't
be called when probing the main part of the stmmac driver.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1ulXcC-008grN-Hc@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c7308b2f

drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c

+5 −5
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int mediatek_dwmac_clk_init(struct mediatek_dwmac_plat_data *plat) 
	return ret;

}



static int mediatek_dwmac_init(struct platform_device *pdev, void *priv)

static int mediatek_dwmac_init(struct device *dev, void *priv)

{

	struct mediatek_dwmac_plat_data *plat = priv;

	const struct mediatek_dwmac_variant *variant = plat->variant;
@@ -532,7 +532,7 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv) 
	if (variant->dwmac_set_phy_interface) {

		ret = variant->dwmac_set_phy_interface(plat);

		if (ret) {

			dev_err(plat->dev, "failed to set phy interface, err = %d\n", ret);

			dev_err(dev, "failed to set phy interface, err = %d\n", ret);

			return ret;

		}

	}
@@ -540,7 +540,7 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv) 
	if (variant->dwmac_set_delay) {

		ret = variant->dwmac_set_delay(plat);

		if (ret) {

			dev_err(plat->dev, "failed to set delay value, err = %d\n", ret);

			dev_err(dev, "failed to set delay value, err = %d\n", ret);

			return ret;

		}

	}
@@ -589,7 +589,7 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, 
	plat->maxmtu = ETH_DATA_LEN;

	plat->host_dma_width = priv_plat->variant->dma_bit_mask;

	plat->bsp_priv = priv_plat;

	plat->init = mediatek_dwmac_init;

	plat->resume = mediatek_dwmac_init;

	plat->clks_config = mediatek_dwmac_clks_config;



	plat->safety_feat_cfg = devm_kzalloc(&pdev->dev,
@@ -654,7 +654,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) 
		return PTR_ERR(plat_dat);



	mediatek_dwmac_common_data(pdev, plat_dat, priv_plat);

	mediatek_dwmac_init(pdev, priv_plat);

	mediatek_dwmac_init(&pdev->dev, priv_plat);



	ret = mediatek_dwmac_clks_config(priv_plat, true);

	if (ret)