Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062AbdLOKcO (ORCPT ); Fri, 15 Dec 2017 05:32:14 -0500 Received: from mout.web.de ([212.227.15.3]:65334 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755397AbdLOKcJ (ORCPT ); Fri, 15 Dec 2017 05:32:09 -0500 Subject: [PATCH 3/7] rapidio: Adjust five function calls together with a variable assignment From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Alexandre Bounine , Matt Porter Cc: LKML References: Message-ID: <6f5631ed-ec3e-503d-850a-ab09b5736dbe@users.sourceforge.net> Date: Fri, 15 Dec 2017 11:31:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:yuDr2G28KyYD9FMyIMxnyCgSys9NRgFUxmPZXp9TbjW0pBBThWT +uQskJYLCcCJyrQYz1btuFeO7cQYxAmhnXhpwbDhwPSbVWc7mbT6qhZyUzpe1w2JCMz958u qldXYn4TzNrd2cALFLEDcZQ4X0sxPkP+XMwYrGiAQLohLvszcKWPiUi9rfD4UeSJIrbzf6R vpQETIC3g09z0lbw4+3fQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:bP49fvUQVog=:TdePuSER5Il4U2v+jIlJvo OFUQx6a+EQmtf0dGgW3U6w4H3emPMrqL+P3tak4g0DBKECJNm5fR6GMlqZTpRLn8BFv9yeu+V EhmuTeL+BL0oEgxKxbGdo9wRw1VZr6CK8jAlPS/l4NsBlc+7zpZ9aPeWu17NsZ3JD9sUgOTT+ d9i8tGFjPFWGqlB3CPP7yomUQpU+97THhY5LhiolcF2aPQQ3xsJyqSLNlqGJAIh6HMEaGLWT9 n/1kv266lMEX9b44eT0ZfAz37+fKvmmb+LAJLfVD161q4teGFsMNe0Ncl6IhGj5mqE6avtJnc F4kNOajYYICPxFuX672bZqJy7gdK1H9INXf4iO8wwzcpn+iR+mMX3WgNmgPwbxzMrb5Q5vmSS D9h6WAy5xZ5PWk9sz8lVVaKsVoKfVrCn6eMTCi2lrmJKMUPHQk4ituR6iG2kfhk2h62idDklm Nrx++z+NfFqBP2G8V73P5H/Flv7CeyYgXcUsU6IVVeUiCX/FCqa+lrs+GYPNXCrntvGEA71S8 pKrOJ8u+qYFgU56iMuWDkD+Szz9sctFV6RIcJo1HCtPQrBp5bcWGLtu+opX0gnHgOvGWMwLPT uxj2DH6Yfc9O3Q8B62v7Dw+EYZ1xsgXNmj1c2VQtrx6qD1wra7W1IEzgCCRKgTUUPI53fLRWU hDh441qvE7L5/B5Awa4m2KgXO+62FORDXm8k3FyLRwWXI7Jk00KllDcCx8TxgSPDnpAAQuibB +f64FkGIWwKUm5QLfQA/Xx6VMO+6+8Q+N1aUgaHzuh+vZ2UZ7UM7zwGHGdT2qQngePRlHIntw ram5Km9IZH9IMIRji48+TBx7Ds2ZmGzEwJW3ClPVPdaFXSwePwG0LjqWSIdcIFy0+8Ny4nq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2464 Lines: 82 From: Markus Elfring Date: Thu, 14 Dec 2017 16:07:07 +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 --- drivers/rapidio/rio.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index f89085564c2c..b9dc932ce19e 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c @@ -252,9 +252,9 @@ int rio_request_inb_mbox(struct rio_mport *mport, rio_init_mbox_res(res, mbox, mbox); /* Make sure this mailbox isn't in use */ - if ((rc = - request_resource(&mport->riores[RIO_INB_MBOX_RESOURCE], - res)) < 0) { + rc = request_resource(&mport->riores[RIO_INB_MBOX_RESOURCE], + res); + if (rc < 0) { kfree(res); goto out; } @@ -335,9 +335,9 @@ int rio_request_outb_mbox(struct rio_mport *mport, rio_init_mbox_res(res, mbox, mbox); /* Make sure this outbound mailbox isn't in use */ - if ((rc = - request_resource(&mport->riores[RIO_OUTB_MBOX_RESOURCE], - res)) < 0) { + rc = request_resource(&mport->riores[RIO_OUTB_MBOX_RESOURCE], + res); + if (rc < 0) { kfree(res); goto out; } @@ -406,9 +406,9 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res, u16 info)) { int rc = 0; - struct rio_dbell *dbell; + struct rio_dbell *dbell = kmalloc(sizeof(*dbell), GFP_KERNEL); - if (!(dbell = kmalloc(sizeof(struct rio_dbell), GFP_KERNEL))) { + if (!dbell) { rc = -ENOMEM; goto out; } @@ -452,9 +452,9 @@ int rio_request_inb_dbell(struct rio_mport *mport, rio_init_dbell_res(res, start, end); /* Make sure these doorbells aren't in use */ - if ((rc = - request_resource(&mport->riores[RIO_DOORBELL_RESOURCE], - res)) < 0) { + rc = request_resource(&mport->riores[RIO_DOORBELL_RESOURCE], + res); + if (rc < 0) { kfree(res); goto out; } @@ -1411,7 +1411,9 @@ rio_mport_get_feature(struct rio_mport * port, int local, u16 destid, ext_ftr_ptr, &ftr_header); if (RIO_GET_BLOCK_ID(ftr_header) == ftr) return ext_ftr_ptr; - if (!(ext_ftr_ptr = RIO_GET_BLOCK_PTR(ftr_header))) + + ext_ftr_ptr = RIO_GET_BLOCK_PTR(ftr_header); + if (!ext_ftr_ptr) break; } -- 2.15.1