From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750969AbdKSPfb (ORCPT ); Sun, 19 Nov 2017 10:35:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:35790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750784AbdKSPf3 (ORCPT ); Sun, 19 Nov 2017 10:35:29 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56E342187B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=jic23@kernel.org Date: Sun, 19 Nov 2017 15:35:24 +0000 From: Jonathan Cameron To: SF Markus Elfring Cc: devel@driverdev.osuosl.org, linux-iio@vger.kernel.org, Greg Kroah-Hartman , Hartmut Knaack , Lars-Peter Clausen , Michael Hennerich , Peter Meerwald-Stadler , LKML , kernel-janitors@vger.kernel.org Subject: Re: [PATCH] staging: iio: ad7152: Improve unlocking of a mutex in ad7152_start_calib() Message-ID: <20171119153524.0a88acd9@archlinux> In-Reply-To: References: X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 3 Nov 2017 09:09:21 +0100 SF Markus Elfring wrote: > From: Markus Elfring > Date: Fri, 3 Nov 2017 09:00:25 +0100 > > * Add a jump target so that a call of the function "mutex_unlock" is stored > only twice in this function implementation. > > * Replace two calls by goto statements. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring A reasonable tidy up that slightly improves the code. Just makes it past past the point where the benefit justifies the code churn. Applied to the togreg branch of iio.git and pushed out as testing. Thanks, Jonathan > --- > drivers/staging/iio/cdc/ad7152.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c > index 61377ca444de..59d1b35f6a4e 100644 > --- a/drivers/staging/iio/cdc/ad7152.c > +++ b/drivers/staging/iio/cdc/ad7152.c > @@ -118,22 +118,23 @@ static inline ssize_t ad7152_start_calib(struct device *dev, > > mutex_lock(&chip->state_lock); > ret = i2c_smbus_write_byte_data(chip->client, AD7152_REG_CFG, regval); > - if (ret < 0) { > - mutex_unlock(&chip->state_lock); > - return ret; > - } > + if (ret < 0) > + goto unlock; > > do { > mdelay(20); > ret = i2c_smbus_read_byte_data(chip->client, AD7152_REG_CFG); > - if (ret < 0) { > - mutex_unlock(&chip->state_lock); > - return ret; > - } > + if (ret < 0) > + goto unlock; > + > } while ((ret == regval) && timeout--); > > mutex_unlock(&chip->state_lock); > return len; > + > +unlock: > + mutex_unlock(&chip->state_lock); > + return ret; > } > > static ssize_t ad7152_start_offset_calib(struct device *dev,