net: ethernet: fix similar warning reported by kbuild test robot

[linux.git] / drivers / net / ethernet / marvell / mvneta.c

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index a944be3c57b1416bae5929c28facae10abdea507..e758650b2c26e29fc7f5df3ae4e49e7111ec39ed 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2467,7 +2467,7 @@ static netdev_tx_t mvneta_tx(struct sk_buff *skb, struct net_device *dev)
                if (txq->count >= txq->tx_stop_threshold)
                        netif_tx_stop_queue(nq);
 
-               if (!skb->xmit_more || netif_xmit_stopped(nq) ||
+               if (!netdev_xmit_more() || netif_xmit_stopped(nq) ||
                    txq->pending + frags > MVNETA_TXQ_DEC_SENT_MASK)
                        mvneta_txq_pend_desc_add(pp, txq, frags);
                else
@@ -4476,15 +4476,14 @@ static int mvneta_probe(struct platform_device *pdev)
        int err;
        int cpu;
 
-       dev = alloc_etherdev_mqs(sizeof(struct mvneta_port), txq_number, rxq_number);
+       dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct mvneta_port),
+                                     txq_number, rxq_number);
        if (!dev)
                return -ENOMEM;
 
        dev->irq = irq_of_parse_and_map(dn, 0);
-       if (dev->irq == 0) {
-               err = -EINVAL;
-               goto err_free_netdev;
-       }
+       if (dev->irq == 0)
+               return -EINVAL;
 
        phy_mode = of_get_phy_mode(dn);
        if (phy_mode < 0) {
@@ -4564,9 +4563,9 @@ static int mvneta_probe(struct platform_device *pdev)
        }
 
        dt_mac_addr = of_get_mac_address(dn);
-       if (dt_mac_addr) {
+       if (!IS_ERR(dt_mac_addr)) {
                mac_from = "device tree";
-               memcpy(dev->dev_addr, dt_mac_addr, ETH_ALEN);
+               ether_addr_copy(dev->dev_addr, dt_mac_addr);
        } else {
                mvneta_get_mac_addr(pp, hw_mac_addr);
                if (is_valid_ether_addr(hw_mac_addr)) {
@@ -4705,8 +4704,6 @@ static int mvneta_probe(struct platform_device *pdev)
                phylink_destroy(pp->phylink);
 err_free_irq:
        irq_dispose_mapping(dev->irq);
-err_free_netdev:
-       free_netdev(dev);
        return err;
 }
 
@@ -4723,7 +4720,6 @@ static int mvneta_remove(struct platform_device *pdev)
        free_percpu(pp->stats);
        irq_dispose_mapping(dev->irq);
        phylink_destroy(pp->phylink);
-       free_netdev(dev);
 
        if (pp->bm_priv) {
                mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);