From: Peng Li <lipeng321@huawei.com>
Date: Mon, 24 May 2021 14:47:14 +0000 (+0800)
Subject: net: wan: move out assignment in if condition
X-Git-Tag: v5.14-rc1~119^2~462^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87feef1cfbbe9233c53d5c4ff03277b70b58c458;p=thirdparty%2Fkernel%2Flinux.git

net: wan: move out assignment in if condition

Should not use assignment in if condition.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 7965c648f3ebf..a5f0aae30e0ce 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -404,7 +404,9 @@ static int wanxl_open(struct net_device *dev)
 		netdev_err(dev, "port already open\n");
 		return -EIO;
 	}
-	if ((i = hdlc_open(dev)) != 0)
+
+	i = hdlc_open(dev);
+	if (i)
 		return i;
 
 	port->tx_in = port->tx_out = 0;
@@ -730,7 +732,8 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
 
 	timeout = jiffies + 5 * HZ;
 	do {
-		if ((stat = readl(card->plx + PLX_MAILBOX_5)) != 0)
+		stat = readl(card->plx + PLX_MAILBOX_5);
+		if (stat)
 			break;
 		schedule();
 	} while (time_after(timeout, jiffies));