From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH v3 4/4] iio: imu: inv_mpu6050: clean read channel data error path
Date: Sat, 21 Apr 2018 16:11:07 +0100 [thread overview]
Message-ID: <20180421161107.4f9b3535@archlinux> (raw)
In-Reply-To: <1523952442-20104-4-git-send-email-jmaneyrol@invensense.com>
On Tue, 17 Apr 2018 10:07:22 +0200
Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> wrote:
Nice to have some description of how it was cleaned + a signed-off-by...
Jonathan
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index a0cecd9..b842caf 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -330,7 +330,7 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev,
> {
> struct inv_mpu6050_state *st = iio_priv(indio_dev);
> int result;
> - int ret = IIO_VAL_INT;
> + int ret;
>
> result = iio_device_claim_direct_mode(indio_dev);
> if (result)
> @@ -375,14 +375,18 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev,
> break;
> }
>
> -error_power_off:
> - result |= inv_mpu6050_set_power_itg(st, false);
> -error_release:
> - iio_device_release_direct_mode(indio_dev);
> + result = inv_mpu6050_set_power_itg(st, false);
> if (result)
> - return result;
> + goto error_power_off;
> + iio_device_release_direct_mode(indio_dev);
>
> return ret;
> +
> +error_power_off:
> + inv_mpu6050_set_power_itg(st, false);
> +error_release:
> + iio_device_release_direct_mode(indio_dev);
> + return result;
> }
>
> static int
next prev parent reply other threads:[~2018-04-21 15:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 8:07 [PATCH v3 1/4] iio: imu: inv_mpu6050: fix error path not turning chip back off Jean-Baptiste Maneyrol
2018-04-17 8:07 ` [PATCH v3 2/4] iio: imu: inv_mpu6050: use devm_* at init and delete remove Jean-Baptiste Maneyrol
2018-04-21 15:08 ` Jonathan Cameron
2018-04-17 8:07 ` [PATCH v3 3/4] iio: imu: inv_mpu6050: clean read raw by factorizing out raw data Jean-Baptiste Maneyrol
2018-04-21 15:10 ` Jonathan Cameron
2018-04-17 8:07 ` [PATCH v3 4/4] iio: imu: inv_mpu6050: clean read channel data error path Jean-Baptiste Maneyrol
2018-04-21 15:11 ` Jonathan Cameron [this message]
2018-04-21 15:07 ` [PATCH v3 1/4] iio: imu: inv_mpu6050: fix error path not turning chip back off Jonathan Cameron
2018-04-23 10:29 ` Jean-Baptiste Maneyrol
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=20180421161107.4f9b3535@archlinux \
--to=jic23@jic23.retrosnub.co.uk \
--cc=jmaneyrol@invensense.com \
--cc=linux-iio@vger.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;
as well as URLs for NNTP newsgroup(s).