From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751328AbdA1Jl2 (ORCPT ); Sat, 28 Jan 2017 04:41:28 -0500 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 Subject: [PATCH 2/4] dcbnl: Adjust four function calls together with a variable assignment To: netdev@vger.kernel.org, "David S. Miller" , Pan Bian References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Sat, 28 Jan 2017 10:34:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:f8Ef8aTWmgOH2WPCt84p21wurawoqrek5TYgaVodYjU6HjdFnte tmIYHqTKnV808yZ382aFPo488yvkwP4WcDcn2HRETVklrfxVkadP8dnExiRquyRCWR2Ce6T I4J1Tgjn5JlOlJlFOXtKoNRmkNwQL4Mp6xdaxUhiB7XrNfTTUNpBVvX0vckNJH5VWCCOtI7 mzDE1gbVOdQ67Usxxz9qQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:222eODqDC1o=:yQxjXKffXNMrhV8rLgC7oc lhjZHzHcjqMSViz2jurXjLKdv4pp0Q2RFNHZ23FeN+xzBRtYYMba86D8q846v1NM5OffzCyQL +EN/foMy/qioAqk4bFti6YlSX/fSNMQ+8as59n88BdTCMHbw3xwcdJ5KcQHg8JjEU1FwPedMU DULTqot88GaO/oYW6mOk1XtE31qmTudRyUI5DUaPqKSILgXamfBdJ8yTp0CStx8nkZR1dfZuG 0/jf7l1SFL7AnGtGowC2Woh/nlAMCJU1Ci65Q4XGHe4xBwhbgbeD/uCEQCpmjMfFLKns2UbS+ /bNiRhMEwSVTmgXXW/FajNwCP/Jo3gat4BeM5MGXLGhB/49oh1KKY/9CqmTSb09kKAh5xpivC GTwDwev70uRAFXdME1P5dqjyte1sz+GCGVPYN16SeUbWWJPlbRpUL76WfcIwaZTwDQUumYBMr 539qxjTQ8tlLSmOtaao7QSZNjvmGzQeECEaf5dvNLVotd7YKg/Roli5fMwy8PuifUuXV5V9Qt bpeT36R7LTT35f9lvIIuSeB+R1fXjOBZGPRcwVVko2n67hrChKE9JymmrAu7OJ3B2BqMxrBfR j5IYkoimCbr0ZVuz7Vw0oF0Y8GUcWmdWcGWefjLVEvd2Eet6rbvuI7hstaVsSKuSIIiOvNX87 t/o9QRWxHuqIPp51dMNpm1PIW/n1ijrOyEc5S1xyWR34PrtMmwrX8xM78DHicssNdcyPilcYC o35Hx7MEc7+gZ7wpBMzxq4kI9levIN4zFWcgFSUFP7Fl0LW3YA3c5tKZu1Hb4YzO6zDIlzkiD 6bruwYr4EpTYQXdtRqKFd0yoCdx2w== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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