From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 2/4] dcbnl: Adjust four function calls together with a variable assignment Date: Sat, 28 Jan 2017 10:34:59 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: LKML , kernel-janitors@vger.kernel.org To: netdev@vger.kernel.org, "David S. Miller" , Pan Bian Return-path: Received: from mout.web.de ([212.227.15.14]:60217 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbdA1JlX (ORCPT ); Sat, 28 Jan 2017 04:41:23 -0500 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Sat, 28 Jan 2017 09:19:58 +0100 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix the affected source code places. Signed-off-by: Markus Elfring --- net/dcb/dcbnl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index 76fd727e2eb4..f29e19d962ec 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1799,7 +1799,8 @@ u8 dcb_getapp(struct net_device *dev, struct dcb_app *app) u8 prio = 0; spin_lock_bh(&dcb_lock); - if ((itr = dcb_app_lookup(app, dev->ifindex, 0))) + itr = dcb_app_lookup(app, dev->ifindex, 0); + if (itr) prio = itr->app.priority; spin_unlock_bh(&dcb_lock); @@ -1827,7 +1828,8 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new) spin_lock_bh(&dcb_lock); /* Search for existing match and replace */ - if ((itr = dcb_app_lookup(new, dev->ifindex, 0))) { + itr = dcb_app_lookup(new, dev->ifindex, 0); + if (itr) { if (new->priority) itr->app.priority = new->priority; else { @@ -1860,7 +1862,8 @@ u8 dcb_ieee_getapp_mask(struct net_device *dev, struct dcb_app *app) u8 prio = 0; spin_lock_bh(&dcb_lock); - if ((itr = dcb_app_lookup(app, dev->ifindex, 0))) + itr = dcb_app_lookup(app, dev->ifindex, 0); + if (itr) prio |= 1 << itr->app.priority; spin_unlock_bh(&dcb_lock); @@ -1920,7 +1923,8 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del) spin_lock_bh(&dcb_lock); /* Search for existing match and remove it. */ - if ((itr = dcb_app_lookup(del, dev->ifindex, del->priority))) { + itr = dcb_app_lookup(del, dev->ifindex, del->priority); + if (itr) { list_del(&itr->list); kfree(itr); err = 0; -- 2.11.0