From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Cc: linux-iio <linux-iio@vger.kernel.org>
Subject: Re: [PATCH v2 3/4] iio: imu: inv_mpu6050: clean read raw by factorizing out raw data
Date: Sun, 15 Apr 2018 19:02:37 +0100 [thread overview]
Message-ID: <20180415190237.5bb68c18@archlinux> (raw)
In-Reply-To: <64e85117-f9d5-a656-f6c6-6c12a3b84ce8@invensense.com>
On Mon, 9 Apr 2018 16:58:50 +0200
Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> wrote:
> Factorize reading channel data in its own function.
>
> Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Looks good - will pick up in the series when it's rebased along
with the others.
thanks,
Jonathan
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 116
> +++++++++++++++--------------
> 1 file changed, 62 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index 4acf4dc..50d352f 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -318,6 +318,67 @@ static int inv_mpu6050_sensor_show(struct
> inv_mpu6050_state *st, int reg,
> return IIO_VAL_INT;
> }
>
> +static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val)
> +{
> + struct inv_mpu6050_state *st = iio_priv(indio_dev);
> + int result;
> + int ret = IIO_VAL_INT;
> +
> + result = iio_device_claim_direct_mode(indio_dev);
> + if (result)
> + return result;
> + result = inv_mpu6050_set_power_itg(st, true);
> + if (result)
> + goto error_release;
> +
> + switch (chan->type) {
> + case IIO_ANGL_VEL:
> + result = inv_mpu6050_switch_engine(st, true,
> + INV_MPU6050_BIT_PWR_GYRO_STBY);
> + if (result)
> + goto error_power_off;
> + ret = inv_mpu6050_sensor_show(st, st->reg->raw_gyro,
> + chan->channel2, val);
> + result = inv_mpu6050_switch_engine(st, false,
> + INV_MPU6050_BIT_PWR_GYRO_STBY);
> + if (result)
> + goto error_power_off;
> + break;
> + case IIO_ACCEL:
> + result = inv_mpu6050_switch_engine(st, true,
> + INV_MPU6050_BIT_PWR_ACCL_STBY);
> + if (result)
> + goto error_power_off;
> + ret = inv_mpu6050_sensor_show(st, st->reg->raw_accl,
> + chan->channel2, val);
> + result = inv_mpu6050_switch_engine(st, false,
> + INV_MPU6050_BIT_PWR_ACCL_STBY);
> + if (result)
> + goto error_power_off;
> + break;
> + case IIO_TEMP:
> + /* wait for stablization */
> + msleep(INV_MPU6050_SENSOR_UP_TIME);
> + ret = inv_mpu6050_sensor_show(st, st->reg->temperature,
> + IIO_MOD_X, val);
> + break;
> + default:
> + ret = -EINVAL;
> + break;
> + }
> +
> +error_power_off:
> + result |= inv_mpu6050_set_power_itg(st, false);
> +error_release:
> + iio_device_release_direct_mode(indio_dev);
> + if (result)
> + return result;
> +
> + return ret;
> +}
> +
> static int
> inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *chan,
> @@ -328,63 +389,10 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - {
> - int result;
> -
> - ret = IIO_VAL_INT;
> mutex_lock(&st->lock);
> - result = iio_device_claim_direct_mode(indio_dev);
> - if (result)
> - goto error_read_raw_unlock;
> - result = inv_mpu6050_set_power_itg(st, true);
> - if (result)
> - goto error_read_raw_release;
> - switch (chan->type) {
> - case IIO_ANGL_VEL:
> - result = inv_mpu6050_switch_engine(st, true,
> - INV_MPU6050_BIT_PWR_GYRO_STBY);
> - if (result)
> - goto error_read_raw_power_off;
> - ret = inv_mpu6050_sensor_show(st, st->reg->raw_gyro,
> - chan->channel2, val);
> - result = inv_mpu6050_switch_engine(st, false,
> - INV_MPU6050_BIT_PWR_GYRO_STBY);
> - if (result)
> - goto error_read_raw_power_off;
> - break;
> - case IIO_ACCEL:
> - result = inv_mpu6050_switch_engine(st, true,
> - INV_MPU6050_BIT_PWR_ACCL_STBY);
> - if (result)
> - goto error_read_raw_power_off;
> - ret = inv_mpu6050_sensor_show(st, st->reg->raw_accl,
> - chan->channel2, val);
> - result = inv_mpu6050_switch_engine(st, false,
> - INV_MPU6050_BIT_PWR_ACCL_STBY);
> - if (result)
> - goto error_read_raw_power_off;
> - break;
> - case IIO_TEMP:
> - /* wait for stablization */
> - msleep(INV_MPU6050_SENSOR_UP_TIME);
> - ret = inv_mpu6050_sensor_show(st, st->reg->temperature,
> - IIO_MOD_X, val);
> - break;
> - default:
> - ret = -EINVAL;
> - break;
> - }
> -error_read_raw_power_off:
> - result |= inv_mpu6050_set_power_itg(st, false);
> -error_read_raw_release:
> - iio_device_release_direct_mode(indio_dev);
> -error_read_raw_unlock:
> + ret = inv_mpu6050_read_channel_data(indio_dev, chan, val);
> mutex_unlock(&st->lock);
> - if (result)
> - return result;
> -
> return ret;
> - }
> case IIO_CHAN_INFO_SCALE:
> switch (chan->type) {
> case IIO_ANGL_VEL:
prev parent reply other threads:[~2018-04-15 18:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 14:58 [PATCH v2 3/4] iio: imu: inv_mpu6050: clean read raw by factorizing out raw data Jean-Baptiste Maneyrol
2018-04-15 18:02 ` Jonathan Cameron [this message]
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=20180415190237.5bb68c18@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).