Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d3c4af authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dpaa-cleanups' 



yuan linyu says:

====================
net: dpaa: two minor cleanup

original i try to remove duplicate code which clean allocated per-cpu area,
thanks to David S. Miller, there are two build warning as errors.
path 1: fix old code maybe-uninitialized warning.
path 2: remove duplicate code and fix unused var warning.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03c4cc38 d7bcde41

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+2 −6
Original line number Diff line number Diff line
@@ -2468,7 +2468,8 @@ static int dpaa_open(struct net_device *net_dev) 
	mac_dev = priv->mac_dev;

	dpaa_eth_napi_enable(priv);



	if (dpaa_phy_init(net_dev))

	err = dpaa_phy_init(net_dev);

	if (err)

		goto phy_init_failed;



	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -2668,7 +2669,6 @@ static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl) 
static int dpaa_eth_probe(struct platform_device *pdev)

{

	struct dpaa_bp *dpaa_bps[DPAA_BPS_NUM] = {NULL};

	struct dpaa_percpu_priv *percpu_priv;

	struct net_device *net_dev = NULL;

	struct dpaa_fq *dpaa_fq, *tmp;

	struct dpaa_priv *priv = NULL;
@@ -2814,10 +2814,6 @@ static int dpaa_eth_probe(struct platform_device *pdev) 
		err = -ENOMEM;

		goto free_dpaa_fqs;

	}

	for_each_possible_cpu(i) {

		percpu_priv = per_cpu_ptr(priv->percpu_priv, i);

		memset(percpu_priv, 0, sizeof(*percpu_priv));

	}



	priv->num_tc = 1;

	netif_set_real_num_tx_queues(net_dev, priv->num_tc * DPAA_TC_TXQ_NUM);