public inbox for devicetree@vger.kernel.org
 help / color / mirror / Atom feed
From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
To: Jonathan Cameron <jic23@kernel.org>,
	 Lars-Peter Clausen <lars@metafoo.de>,
	Rob Herring <robh@kernel.org>,
	 Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	 devicetree@vger.kernel.org,
	 Javier Carrasco <javier.carrasco.cruz@gmail.com>
Subject: [PATCH 2/7] iio: light: veml6070: use guard to handle mutex
Date: Sun, 29 Sep 2024 22:38:47 +0200	[thread overview]
Message-ID: <20240929-veml6070-cleanup-v1-2-a9350341a646@gmail.com> (raw)
In-Reply-To: <20240929-veml6070-cleanup-v1-0-a9350341a646@gmail.com>

Simplify the mutext handling by using a guard to automate the mutex
unlocking.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
---
 drivers/iio/light/veml6070.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/iio/light/veml6070.c b/drivers/iio/light/veml6070.c
index 3c476b6f6122..945ef58beead 100644
--- a/drivers/iio/light/veml6070.c
+++ b/drivers/iio/light/veml6070.c
@@ -42,36 +42,36 @@ static int veml6070_read(struct veml6070_data *data)
 	int ret;
 	u8 msb, lsb;
 
-	mutex_lock(&data->lock);
+	guard(mutex)(&data->lock);
 
 	/* disable shutdown */
 	ret = i2c_smbus_write_byte(data->client1,
 	    data->config & ~VEML6070_COMMAND_SD);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	msleep(125 + 10); /* measurement takes up to 125 ms for IT 1x */
 
 	ret = i2c_smbus_read_byte(data->client2); /* read MSB, address 0x39 */
 	if (ret < 0)
-		goto out;
+		return ret;
+
 	msb = ret;
 
 	ret = i2c_smbus_read_byte(data->client1); /* read LSB, address 0x38 */
 	if (ret < 0)
-		goto out;
+		return ret;
+
 	lsb = ret;
 
 	/* shutdown again */
 	ret = i2c_smbus_write_byte(data->client1, data->config);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	ret = (msb << 8) | lsb;
 
-out:
-	mutex_unlock(&data->lock);
-	return ret;
+	return 0;
 }
 
 static const struct iio_chan_spec veml6070_channels[] = {

-- 
2.43.0


  parent reply	other threads:[~2024-09-29 20:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-29 20:38 [PATCH 0/7] iio: light: veml6070: update code to current IIO best practices Javier Carrasco
2024-09-29 20:38 ` [PATCH 1/7] iio: light: veml6070: add action for i2c_unregister_device Javier Carrasco
2024-09-29 20:38 ` Javier Carrasco [this message]
2024-09-29 20:38 ` [PATCH 3/7] iio: light: veml6070: use device managed iio_device_register Javier Carrasco
2024-09-29 20:38 ` [PATCH 4/7] iio: light: veml6070: add support for a regulator Javier Carrasco
2024-09-29 20:38 ` [PATCH 5/7] dt-bindings: iio: light: vishay,veml6075: add vishay,veml6070 Javier Carrasco
2024-09-30  7:01   ` Krzysztof Kozlowski
2024-09-29 20:38 ` [PATCH 6/7] iio: light: veml6070: add devicetree support Javier Carrasco
2024-09-30  9:00   ` Jonathan Cameron
2024-09-29 20:38 ` [PATCH 7/7] iio: light: veml6070: use dev_err_probe in probe function Javier Carrasco
2024-09-30  9:00 ` [PATCH 0/7] iio: light: veml6070: update code to current IIO best practices Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240929-veml6070-cleanup-v1-2-a9350341a646@gmail.com \
    --to=javier.carrasco.cruz@gmail.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox