lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 17 Sep 2022 18:38:40 +0800 From: Haoyue Xu <xuhaoyue1@...ilicon.com> To: <davem@...emloft.net>, <kuba@...nel.org>, <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <michal.simek@...inx.com> CC: <huangdaode@...wei.com>, <liyangyang20@...wei.com>, <xuhaoyue1@...ilicon.com>, <huangjunxian6@...ilicon.com>, <linuxarm@...wei.com>, <liangwenpeng@...wei.com> Subject: [PATCH net-next 4/7] net: ll_temac: delete unnecessary else branch From: huangjunxian <huangjunxian6@...ilicon.com> Cleaning some static warnings of unnecessary else branch. Signed-off-by: huangjunxian <huangjunxian6@...ilicon.com> Signed-off-by: Haoyue Xu <xuhaoyue1@...ilicon.com> --- drivers/net/ethernet/xilinx/ll_temac_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 562b461224e7..15d7b7ed0830 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -117,8 +117,8 @@ int temac_indirect_busywait(struct temac_local *lp) spin_until_cond(hard_acs_rdy_or_timeout(lp, timeout)); if (WARN_ON(!hard_acs_rdy(lp))) return -ETIMEDOUT; - else - return 0; + + return 0; } /* @@ -307,11 +307,9 @@ static void temac_dma_bd_release(struct net_device *ndev) for (i = 0; i < lp->rx_bd_num; i++) { if (!lp->rx_skb[i]) break; - else { - dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys, - XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); - dev_kfree_skb(lp->rx_skb[i]); - } + dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys, + XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); + dev_kfree_skb(lp->rx_skb[i]); } if (lp->rx_bd_v) dma_free_coherent(ndev->dev.parent, -- 2.30.0
Powered by blists - more mailing lists