diff options
| author | Felix Fietkau <nbd@nbd.name> | 2022-04-05 21:57:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-06 14:08:50 +0100 |
| commit | 1ccc723b5829d63a29627e1d2de2da84efd037c2 (patch) | |
| tree | 141658777a8868cfe4204fa470867e7003b197bc /drivers/net/ethernet/mediatek/mtk_eth_soc.c | |
| parent | bb14c19122b768c3d659da2e91fb9324a2374d06 (diff) | |
| download | linux-stable-1ccc723b5829d63a29627e1d2de2da84efd037c2.tar.gz linux-stable-1ccc723b5829d63a29627e1d2de2da84efd037c2.tar.bz2 linux-stable-1ccc723b5829d63a29627e1d2de2da84efd037c2.zip | |
net: ethernet: mtk_eth_soc: allocate struct mtk_ppe separately
Preparation for adding more data to it, which will increase its size.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_eth_soc.c')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 4d7c542d89fb..5a2f3cb26e66 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2269,7 +2269,7 @@ static int mtk_open(struct net_device *dev) if (err) return err; - if (eth->soc->offload_version && mtk_ppe_start(ð->ppe) == 0) + if (eth->soc->offload_version && mtk_ppe_start(eth->ppe) == 0) gdm_config = MTK_GDMA_TO_PPE; mtk_gdm_config(eth, gdm_config); @@ -2343,7 +2343,7 @@ static int mtk_stop(struct net_device *dev) mtk_dma_free(eth); if (eth->soc->offload_version) - mtk_ppe_stop(ð->ppe); + mtk_ppe_stop(eth->ppe); return 0; } @@ -3262,10 +3262,11 @@ static int mtk_probe(struct platform_device *pdev) } if (eth->soc->offload_version) { - err = mtk_ppe_init(ð->ppe, eth->dev, - eth->base + MTK_ETH_PPE_BASE, 2); - if (err) + eth->ppe = mtk_ppe_init(eth->dev, eth->base + MTK_ETH_PPE_BASE, 2); + if (!eth->ppe) { + err = -ENOMEM; goto err_free_dev; + } err = mtk_eth_offload_init(eth); if (err) |