net: mvneta: remove unnecessary if condition in mvneta_xdp_submit_frame
authorLorenzo Bianconi <lorenzo@kernel.org>
Thu, 27 Jan 2022 14:47:49 +0000 (15:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Jan 2022 14:29:19 +0000 (14:29 +0000)
Get rid of unnecessary if check on tx_desc pointer in
mvneta_xdp_submit_frame routine since num_frames is always greater than
0 and tx_desc pointer is always initialized.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mvneta.c

index 315a43e4c63d624308a8024babaafd01c68f93c7..f1335a1ed6953f267245b676b8865fa0712efaad 100644 (file)
@@ -2083,7 +2083,7 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq,
 {
        struct skb_shared_info *sinfo = xdp_get_shared_info_from_frame(xdpf);
        struct device *dev = pp->dev->dev.parent;
-       struct mvneta_tx_desc *tx_desc = NULL;
+       struct mvneta_tx_desc *tx_desc;
        int i, num_frames = 1;
        struct page *page;
 
@@ -2140,10 +2140,8 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq,
 
                mvneta_txq_inc_put(txq);
        }
-
        /*last descriptor */
-       if (likely(tx_desc))
-               tx_desc->command |= MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD;
+       tx_desc->command |= MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD;
 
        txq->pending += num_frames;
        txq->count += num_frames;