aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale/enetc/enetc_pf.c
diff options
context:
space:
mode:
authorVladimir Oltean <olteanv@gmail.com>2021-03-10 14:03:42 +0200
committerDavid S. Miller <davem@davemloft.net>2021-03-10 13:14:15 -0800
commit24be14e3260ad8f5b926da8ad0bc0067435e7340 (patch)
tree9dbec1d565c70e6b32f55efaa7f439fe0565f861 /drivers/net/ethernet/freescale/enetc/enetc_pf.c
parentnet: enetc: save the DMA device for enetc_free_cbdr (diff)
downloadlinux-dev-24be14e3260ad8f5b926da8ad0bc0067435e7340.tar.xz
linux-dev-24be14e3260ad8f5b926da8ad0bc0067435e7340.zip
net: enetc: squash enetc_alloc_cbdr and enetc_setup_cbdr
enetc_alloc_cbdr and enetc_setup_cbdr are always called one after another, so we can simplify the callers and make enetc_setup_cbdr do everything that's needed. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/enetc/enetc_pf.c')
-rw-r--r--drivers/net/ethernet/freescale/enetc/enetc_pf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index a7195ec736f3..31d229e0912a 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -1088,12 +1088,10 @@ static void enetc_init_unused_port(struct enetc_si *si)
int err;
si->cbd_ring.bd_count = ENETC_CBDR_DEFAULT_SIZE;
- err = enetc_alloc_cbdr(dev, &si->cbd_ring);
+ err = enetc_setup_cbdr(dev, hw, &si->cbd_ring);
if (err)
return;
- enetc_setup_cbdr(hw, &si->cbd_ring);
-
enetc_init_port_rfs_memory(si);
enetc_init_port_rss_memory(si);