Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   wei.fang@nxp.com
To:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, shenwei.wang@nxp.com, xiaoning.wang@nxp.com,
        simon.horman@corigine.com, netdev@vger.kernel.org
Cc:     linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH V2 net-next] net: fec: remove last_bdp from fec_enet_txq_xmit_frame()
Date:   Mon, 29 May 2023 10:26:15 +0800
Message-Id: <20230529022615.669589-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RidQOiXU7SJfcxfACQidgnMIYd1DLodgutSFxZ4thRa1YWeVGFnEBAthBzDr?=
 =?us-ascii?Q?Pxy1zJ8ZiUBqUmup4+fSxLiAxF0HSqDauP9B45EQ/pUG6D4klVFiNmKEVlIH?=
 =?us-ascii?Q?q5Fl1c909nehVYrIh1T9SMB/d9wOIFDq/tKkmQL33MyYRRoQJ9rcLYeEyCDw?=
 =?us-ascii?Q?55E41OGlfQtZ+Z38NuCRaKAPFr1IUCIpvoyLovGniUS26N7y3B6lFGoRhHrP?=
 =?us-ascii?Q?5OM8GE5FGe8r8fdOASAPCiCdh+naum3Gg7kEOqgqw2qign8tgrltr44rrJAR?=
 =?us-ascii?Q?JEvjgC62QNQU0IsUViVVoOot40huORs7LWtOXZr7t7dk1wShEuJxOMO0UP+u?=
 =?us-ascii?Q?lNlZX3hk9CPDUVDgX0CDiMeH69EpC+FcS7/32Eb0NzLxDdx8VD5bnlTnRFnM?=
 =?us-ascii?Q?2w0zNq2KtbXxkOTsRP9VjHC4BeKog2jD3LskLX+un9zI2rI/1iZ7DhBDPBor?=
 =?us-ascii?Q?0k1X0+P+fXj5F8IZrZnZl+82LeF0R+EpKGLQtiOTr6IpwCtQ67cMBd5t16dM?=
 =?us-ascii?Q?L2ubb2D2jLQ2ygrJxqlUabyeieHaE5Sq1pGmTVhKa78Zeoo9Tc6krzlpZwzo?=
 =?us-ascii?Q?k4lZbTUyeOOW1ZELdWz06Xq+v04ixKva9WuHsvYQLQb0lW/FvQT8Nt8T67yP?=
 =?us-ascii?Q?PPW9fGXRvOE8P0xg4TJc0F4Qr9O5ZRMOkfTYp/a62ZlovUCsV/FEK6SXd8fI?=
 =?us-ascii?Q?F7+fHuDRMqLp32FtnDYU9OCJPnSVq/vjgaAj+t1bE5lStG64UKcOCGFRE6MR?=
 =?us-ascii?Q?Xrtlih3IKUHtaLiqJoFU1jnEnE5bwj2u9Zc05CtZL2rqq7hT5AA2vVF3Pf5S?=
 =?us-ascii?Q?GfZoRqVlbTIzg7bixafMhxTRCcBa6eWWOOGzPjOMY7o/0EFRFHPcNeUYOYee?=
 =?us-ascii?Q?4Ixxan5ehGDrfWq96SblwRZF9wNQl+XletFD8CDDnbEzfEJIXJ4A9jRwXDOZ?=
 =?us-ascii?Q?TAy+obA3/q2BDX3FpLYQip8B1KXpSl2gD8M7jxA6M/OhbNK5ibfvG9cigGkp?=
 =?us-ascii?Q?ym50yhdK8m1DW2Nz88t+8mTa5uUxBxPiazxdFNOXw02bwOmpJG6dsKQCSgSB?=
 =?us-ascii?Q?AMPXR2XeyigpciEVDMp6W8xsNq77//WmmQi+uYpLAc5AYnhEn4G/pnuwCReY?=
 =?us-ascii?Q?KgjRFiCtwRCkkfcj0uFjpK/sgziYbt80vyiX9L8OE08iSohpkOauAu5Z2SZB?=
 =?us-ascii?Q?rCHokCiDtvuGhIu8V2AqUsPVFVjGHznZSJSSFA+zxG+leE6NF6x6dII+IFkW?=
 =?us-ascii?Q?n0tl5LYd8N4kZWzHI3smv2xdtP+1QuNJa+e0MGgUrLgPyyrBqDV96D365eiI?=
 =?us-ascii?Q?MIcGK/d0zY/nKB9H1WrEQUnuco8PSRDv5kSjN/8h/VyUsXjs4L1c+vBKukEi?=
 =?us-ascii?Q?X7MDvjwbQwPA0ZhovJ2Wn1HKrdDfOYSKM7Cu3kWt9hLDSMOiNOGMNMi6uMEZ?=
 =?us-ascii?Q?Q/dlHqViVsQZcyXKpPzzczLeO2QGDfASsyP32kCUiii13fvsaZpaBifzT4Uf?=
 =?us-ascii?Q?EgSzVwo1qbU4ScNXGNMPSElJn6eGeo/0haL83U0x60CGXSij4rLCjbh0GwPL?=
 =?us-ascii?Q?XMoXgtSqg6dVS0AurnwqImiE7keg7TKSCQtJBq9r?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 209b156b-da5e-4381-873b-08db5fecb9ce
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 02:30:53.9319
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6TRgTQiCU2xbpXbv14pEL6/Z6Zve5w3L6GvZWaLC1YPeao5AEDlmOStekjU/mE59162cMHkVjjaFyOL2+YSUjw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7825
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wei Fang <wei.fang@nxp.com>

The last_bdp is initialized to bdp, and both last_bdp and bdp are
not changed. That is to say that last_bdp and bdp are always equal.
So bdp can be used directly.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
V2 change:
Refine the commit message to make it more clear which is suggested
by Simon Horman.
---
 drivers/net/ethernet/freescale/fec_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 632bb4d589d7..4d37a811ae15 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3770,7 +3770,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 				   struct xdp_frame *frame)
 {
 	unsigned int index, status, estatus;
-	struct bufdesc *bdp, *last_bdp;
+	struct bufdesc *bdp;
 	dma_addr_t dma_addr;
 	int entries_free;
 
@@ -3782,7 +3782,6 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 
 	/* Fill in a Tx ring entry */
 	bdp = txq->bd.cur;
-	last_bdp = bdp;
 	status = fec16_to_cpu(bdp->cbd_sc);
 	status &= ~BD_ENET_TX_STATS;
 
@@ -3810,7 +3809,6 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 		ebdp->cbd_esc = cpu_to_fec32(estatus);
 	}
 
-	index = fec_enet_get_bd_index(last_bdp, &txq->bd);
 	txq->tx_skbuff[index] = NULL;
 
 	/* Make sure the updates to rest of the descriptor are performed before
@@ -3825,7 +3823,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 	bdp->cbd_sc = cpu_to_fec16(status);
 
 	/* If this was the last BD in the ring, start at the beginning again. */
-	bdp = fec_enet_get_nextdesc(last_bdp, &txq->bd);
+	bdp = fec_enet_get_nextdesc(bdp, &txq->bd);
 
 	/* Make sure the update to bdp are performed before txq->bd.cur. */
 	dma_wmb();
-- 
2.25.1