OSDN Git Service

net: enetc: remove local "priv" variable in enetc_clean_tx_ring()
authorVladimir Oltean <vladimir.oltean@nxp.com>
Wed, 20 Oct 2021 17:42:19 +0000 (20:42 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 21 Oct 2021 22:35:50 +0000 (15:35 -0700)
The "priv" variable is needed in the "check_writeback" scope since
commit d39823121911 ("enetc: add hardware timestamping support").

Since commit 7294380c5211 ("enetc: support PTP Sync packet one-step
timestamping"), we also need "priv" in the larger function scope.

So the local variable from the "if" block scope is not needed, and
actually shadows the other one. Delete it.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/enetc/enetc.c

index 8e31fe1..082b94e 100644 (file)
@@ -813,10 +813,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget)
                bool is_eof = tx_swbd->is_eof;
 
                if (unlikely(tx_swbd->check_wb)) {
-                       struct enetc_ndev_priv *priv = netdev_priv(ndev);
-                       union enetc_tx_bd *txbd;
-
-                       txbd = ENETC_TXBD(*tx_ring, i);
+                       union enetc_tx_bd *txbd = ENETC_TXBD(*tx_ring, i);
 
                        if (txbd->flags & ENETC_TXBD_FLAGS_W &&
                            tx_swbd->do_twostep_tstamp) {