Commit 5b4daa7f authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: pass bd_count as an argument to enetc_setup_cbdr 



It makes no sense from an API perspective to first initialize some
portion of struct enetc_cbdr outside enetc_setup_cbdr, then leave that
function to initialize the rest. enetc_setup_cbdr should be able to
perform all initialization given a zero-initialized struct enetc_cbdr.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0bfde022

drivers/net/ethernet/freescale/enetc/enetc.c

+2 −4
Original line number Diff line number Diff line
@@ -1050,9 +1050,6 @@ void enetc_init_si_rings_params(struct enetc_ndev_priv *priv) 
	priv->bdr_int_num = cpus;

	priv->ic_mode = ENETC_IC_RX_ADAPTIVE | ENETC_IC_TX_MANUAL;

	priv->tx_ictt = ENETC_TXIC_TIMETHR;



	/* SI specific */

	si->cbd_ring.bd_count = ENETC_CBDR_DEFAULT_SIZE;

}



int enetc_alloc_si_resources(struct enetc_ndev_priv *priv)
@@ -1060,7 +1057,8 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) 
	struct enetc_si *si = priv->si;

	int err;



	err = enetc_setup_cbdr(priv->dev, &si->hw, &si->cbd_ring);

	err = enetc_setup_cbdr(priv->dev, &si->hw, ENETC_CBDR_DEFAULT_SIZE,

			       &si->cbd_ring);

	if (err)

		return err;

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type, 
void enetc_set_ethtool_ops(struct net_device *ndev);



/* control buffer descriptor ring (CBDR) */

int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw,

int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw, int bd_count,

		     struct enetc_cbdr *cbdr);

void enetc_teardown_cbdr(struct enetc_cbdr *cbdr);

int enetc_set_mac_flt_entry(struct enetc_si *si, int index,

drivers/net/ethernet/freescale/enetc/enetc_cbdr.c

+3 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 


#include "enetc.h"



int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw,

int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw, int bd_count,

		     struct enetc_cbdr *cbdr)

{

	int size = cbdr->bd_count * sizeof(struct enetc_cbd);

	int size = bd_count * sizeof(struct enetc_cbd);



	cbdr->bd_base = dma_alloc_coherent(dev, size, &cbdr->bd_dma_base,

					   GFP_KERNEL);
@@ -23,6 +23,7 @@ int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw, 
	cbdr->next_to_clean = 0;

	cbdr->next_to_use = 0;

	cbdr->dma_dev = dev;

	cbdr->bd_count = bd_count;



	cbdr->pir = hw->reg + ENETC_SICBDRPIR;

	cbdr->cir = hw->reg + ENETC_SICBDRCIR;

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+1 −2
Original line number Diff line number Diff line
@@ -1087,8 +1087,7 @@ static void enetc_init_unused_port(struct enetc_si *si) 
	struct enetc_hw *hw = &si->hw;

	int err;



	si->cbd_ring.bd_count = ENETC_CBDR_DEFAULT_SIZE;

	err = enetc_setup_cbdr(dev, hw, &si->cbd_ring);

	err = enetc_setup_cbdr(dev, hw, ENETC_CBDR_DEFAULT_SIZE, &si->cbd_ring);

	if (err)

		return;