From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751493AbdEBO2B (ORCPT ); Tue, 2 May 2017 10:28:01 -0400 Received: from mout.web.de ([212.227.17.12]:63699 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbdEBO16 (ORCPT ); Tue, 2 May 2017 10:27:58 -0400 Subject: [PATCH 3/6] md: Adjust four function calls together with a variable assignment From: SF Markus Elfring To: linux-raid@vger.kernel.org, Neil Brown , Shaohua Li Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <7d82f7ed-6d1d-a666-0d55-2769f27a4ef3@users.sourceforge.net> Date: Tue, 2 May 2017 16:27:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 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:Ema6mNQhcgWGhj30NCkgoDNui6n1sLSrL256yDZKhfWd/vJi4DA WZFLgfA+mMsbFAShkFeHXQnsIIT7I4cCNmDqOLpSIJrpi4gQ+9yKQiC2BPRmkYX/m5PkiPt YeQliWnPLLrg+1IroZgG7d4L81Ey1WFWf6BO8BPOIqoWm+ops8QyZR/Qyaq7iDtrd6eTM7I 1SB5C6pHGm4LW4FowaucQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:6mQw+bL7s8U=:01o6Yj+x4ForxKDGNrqrKN BTmL8qd18hXm9Lj8nhjPZCfnB7yCEijcIFn3e++L3dXQsKUXl0Wp4KBmrcz1JtyilNge41aVG 8Nd3Chcp+CQv+HHKUC/C1i8Tip56HBZ/AJrLdGHIRnn35n9tlCBAJnwTl/dF/qz4/79oiltNB ahCC61WFNZ79jfN7g7JSci7HzLX9WGQ1fQzyTFGKcsf0hMcPpsZ2h1xhALMEbj8aHo037d3El Yc8cZNMg1EX7+3yZ++p+8peJpgTLEcMGepuD0k6j1I59srJC7cizcmGFCclifWde+0Gy8h/vb wtQdo7Md87c+Jn8TwI+ZThR10SI1P/NGHsYAFcQyCuQnY6H6JSStqstAYZRrUAp9TsQF52nXm 1JJ6rVOHR6AK9wLjk/T9XSqyXmdzG+CuA16VNaIe/2brFSk4Ue/+BrdSFOY8/LOkBBuaqbWod FDaL6KijYdXFnPS1TO4lCbdkvFlMnOjABMtQeBbfoLNMt4+y76RTbvbvaAqjxND+6gtSP2NIg hm+XsvUz69l2pj3X68cDXRiEZUUQEwC3Py1Yy6nZYqmplRnjzGueh2T6HU8P5zAuWn2k3CkcE wOXmj8Y994rxs5f1RAPn+OiGonM90yVpOF0tEmnAfaWhj2gkCywhkdmLWq245hUZKTu95/W1b lZCPGTZcSD+x3UDyDADUxaVjly89FrnXxDVE1pwHLHShUt25i386wvmpTCaU9VhY/8wsjE9Jw tV3GirOkCnZnZ1A4EOsoTnXsdl5vjUv8bcJeJXd3CrZR5W6o6IEOtl3bJhLzkN1l4i8BJkJ+/ aWoS9ga Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 2 May 2017 15:07:21 +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 --- drivers/md/md.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 65233a91e5e2..60580095a5de 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2153,7 +2153,8 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev) rdev->mddev = mddev; pr_debug("md: bind<%s>\n", b); - if ((err = kobject_add(&rdev->kobj, &mddev->kobj, "dev-%s", b))) + err = kobject_add(&rdev->kobj, &mddev->kobj, "dev-%s", b); + if (err) goto fail; ko = &part_to_dev(rdev->bdev->bd_part)->kobj; @@ -7306,7 +7307,8 @@ static int md_open(struct block_device *bdev, fmode_t mode) } BUG_ON(mddev != bdev->bd_disk->private_data); - if ((err = mutex_lock_interruptible(&mddev->open_mutex))) + err = mutex_lock_interruptible(&mddev->open_mutex); + if (err) goto out; if (test_bit(MD_CLOSING, &mddev->flags)) { @@ -8927,10 +8929,12 @@ static int __init md_init(void) if (!md_misc_wq) goto err_misc_wq; - if ((ret = register_blkdev(MD_MAJOR, "md")) < 0) + ret = register_blkdev(MD_MAJOR, "md"); + if (ret < 0) goto err_md; - if ((ret = register_blkdev(0, "mdp")) < 0) + ret = register_blkdev(0, "mdp"); + if (ret < 0) goto err_mdp; mdp_major = ret; -- 2.12.2