Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1638157

[PATCH 4/4] hamradio: Adjust four function calls together with a variable assignment

Path csiph.com!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 4/4] hamradio: Adjust four function calls together with a variable assignment
Date Tue, 09 May 2017 16:30:02 +0200
Message-ID <tFejg-2TS-19@gated-at.bofh.it> (permalink)
References <tFejg-2TS-15@gated-at.bofh.it>
User-Agent Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1
MIME-Version 1.0
Content-Type text/plain; charset=utf-8
Content-Language en-US
Content-Transfer-Encoding 7bit
X-Provags-ID V03:K0:PbG8WlpfaX9Ma1km1XkKzQ6C8GZAIIAe3aE71KYfVo3R2UM9ZbC qu1KFohZV1oO2+m3OL0j6dPCy8F9dRTyMDA0qAHvujk/3ph02sA/eh14Ag9iwhHldsrFeAl mSzwCfKquAMRyiyq+1b3Dbgn4RcL3wt66W8CYFCBjHpKsYivZdp/xPGJU1giwtMrmhll1KV 5EB76EQsUq8f3RnC7MwVA==
X-Ui-Out-Filterresults notjunk:1;V01:K0:EKYss4XYT0o=:c4C6kQVLoVYwBR5GIKdltp luynqy3qD6LahZj507nBhIgDqVV1Hx0minyjnBO+AVUKIP1yAdIbsT5HT8EBiKe+Z3ZXtdpG6 8QvW70tX/I2TfcwTGK4I8hZv99yDvE95aqBdz7I99q6DuGI2O45bS2HgxtfEE5AR0PsMKxUnW i2tPMtsHYAsW6mKET0dJC681JGEq9DfgL3fOgJxaUUpcW1yqz9I+7tSR7FlyLk01+2cBrLQG9 h+KfLE2elguUWRzG862yoXCD79nkTC51qSm++4ci5QKkTd0ZEMbAWhhIsNBdioIGr9jrwhAnX IB2nJ2QozrWbaR9xlAI2aysVl7BFsU8sgwFWNzAgWmoF8bOXnrbdaD9GYdZ4cC6xIcnxYNGZ+ Za3RgzBy1lWUkhm43ph/2N0hrhpHvDIdr02JnqQ4RDnnl9vf3dLfOK4BdTTFZlkJIR8N1br6Q xs/VMQ4FyC1fu308/r1uNZs5xmm6Yot0StYpCX5Mq3RcfYvvJNxCS1EL3REGLTZdeN8yuclAQ bRtbLQTyce1agbuWANLsh5xuIRednQDFNblhlrn/JmNpEkOT+Q51QmDMSdsZpRy5n8igbEXxP CcEluxzWCdagyl2iKhekwoIlGGqSvHonn1seez/F3M6lOQEfAwRiFRR2289Uo6g2qI+arwB5R pq601+ZZ6zR4J4a2z9t0ssWkOJNyGxSm3Mw5IAx1ueZFd8Fz9DheR08kjozathI1jwWRHv8DO /R6FDtfjAGOQ8AFicioBIXWfDxcKF/H4bFLe/JdskJeSFnq1Hd3xSGJlnThf9JrJkYKQdr59p /x+Dwx/
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 57
Organization linux.* mail to news gateway
X-Original-Cc LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
X-Original-Date Tue, 9 May 2017 16:25:07 +0200
X-Original-Message-ID <20f62ffa-b12a-f14c-df7b-96a750153823@users.sourceforge.net>
X-Original-References <4c5c939a-bd55-7b88-8e41-49f5544b7658@users.sourceforge.net>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1638157

Show key headers only | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 9 May 2017 15:57:17 +0200

The script "checkpatch.pl" pointed information out like the following.

ERROR: do not use assignment in if condition

Thus fix affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/net/hamradio/bpqether.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index eaa0f2e8e561..5e234e0ca256 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -185,7 +185,8 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
 	if (!net_eq(dev_net(dev), &init_net))
 		goto drop;
 
-	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+	skb = skb_share_check(skb, GFP_ATOMIC);
+	if (!skb)
 		return NET_RX_DROP;
 
 	if (!pskb_may_pull(skb, sizeof(struct ethhdr)))
@@ -286,7 +287,8 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 	bpq = netdev_priv(dev);
 
 	orig_dev = dev;
-	if ((dev = bpq_get_ether_dev(dev)) == NULL) {
+	dev = bpq_get_ether_dev(dev);
+	if (!dev) {
 		orig_dev->stats.tx_dropped++;
 		kfree_skb(skb);
 		return NETDEV_TX_OK;
@@ -565,12 +567,14 @@ static int bpq_device_event(struct notifier_block *this,
 		break;
 
 	case NETDEV_DOWN:	/* ethernet device closed -> close BPQ interface */
-		if ((dev = bpq_get_ax25_dev(dev)) != NULL)
+		dev = bpq_get_ax25_dev(dev);
+		if (dev)
 			dev_close(dev);
 		break;
 
 	case NETDEV_UNREGISTER:	/* ethernet device removed -> free BPQ interface */
-		if ((dev = bpq_get_ax25_dev(dev)) != NULL)
+		dev = bpq_get_ax25_dev(dev);
+		if (dev)
 			bpq_free_device(dev);
 		break;
 	default:
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/4] hamradio: Fine-tuning for nine function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-05-09 16:30 +0200
  [PATCH 4/4] hamradio: Adjust four function calls together with a  variable assignment SF Markus Elfring <elfring@users.sourceforge.net> - 2017-05-09 16:30 +0200
  [PATCH 2/4] hamradio: Adjust four function calls together with a  variable assignment SF Markus Elfring <elfring@users.sourceforge.net> - 2017-05-09 16:30 +0200
  Re: [PATCH 0/4] hamradio: Fine-tuning for nine function  implementations David Miller <davem@davemloft.net> - 2017-05-09 16:50 +0200

csiph-web