On Wed, 30 May 2018 08:52:18 +0200
Jean-Baptiste Maneyrol <jmaneyrol@xxxxxxxxxxxxxx> wrote:
> Use only a single return at the end of the function and return
> sensor_show value for calibbias reading including possible error.
>
> Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@xxxxxxxxxxxxxx>
Why? Direct returns are generally preferred in most of hte kernel
if there is no unwinding to be centralized. One reason is that
they are easier to review as you don't have to check the path beyond
the return.
I'm not seeing any particular reason here, so i need an explanation
of why in the patch description, not what...
Jonathan
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 46 ++++++++++++----------
> 1 file changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index de68e83fc52d..1f0c71f338ae 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -397,13 +397,12 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev,
> return result;
> }
>
> -static int
> -inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> - struct iio_chan_spec const *chan,
> - int *val, int *val2, long mask)
> +static int inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val, int *val2, long mask)
> {
> struct inv_mpu6050_state *st = iio_priv(indio_dev);
> - int ret = 0;
> + int ret;
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> @@ -414,7 +413,7 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> ret = inv_mpu6050_read_channel_data(indio_dev, chan, val);
> mutex_unlock(&st->lock);
> iio_device_release_direct_mode(indio_dev);
> - return ret;
> + break;
> case IIO_CHAN_INFO_SCALE:
> switch (chan->type) {
> case IIO_ANGL_VEL:
> @@ -422,31 +421,33 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> *val = 0;
> *val2 = gyro_scale_6050[st->chip_config.fsr];
> mutex_unlock(&st->lock);
> -
> - return IIO_VAL_INT_PLUS_NANO;
> + ret = IIO_VAL_INT_PLUS_NANO;
> + break;
> case IIO_ACCEL:
> mutex_lock(&st->lock);
> *val = 0;
> *val2 = accel_scale[st->chip_config.accl_fs];
> mutex_unlock(&st->lock);
> -
> - return IIO_VAL_INT_PLUS_MICRO;
> + ret = IIO_VAL_INT_PLUS_MICRO;
> + break;
> case IIO_TEMP:
> *val = 0;
> *val2 = INV_MPU6050_TEMP_SCALE;
> -
> - return IIO_VAL_INT_PLUS_MICRO;
> + ret = IIO_VAL_INT_PLUS_MICRO;
> + break;
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
> case IIO_CHAN_INFO_OFFSET:
> switch (chan->type) {
> case IIO_TEMP:
> *val = INV_MPU6050_TEMP_OFFSET;
> -
> - return IIO_VAL_INT;
> + ret = IIO_VAL_INT;
> + break;
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
> case IIO_CHAN_INFO_CALIBBIAS:
> switch (chan->type) {
> @@ -455,20 +456,23 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
> ret = inv_mpu6050_sensor_show(st, st->reg->gyro_offset,
> chan->channel2, val);
> mutex_unlock(&st->lock);
> - return IIO_VAL_INT;
> + break;
> case IIO_ACCEL:
> mutex_lock(&st->lock);
> ret = inv_mpu6050_sensor_show(st, st->reg->accl_offset,
> chan->channel2, val);
> mutex_unlock(&st->lock);
> - return IIO_VAL_INT;
> -
> + break;
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
> default:
> - return -EINVAL;
> + ret = -EINVAL;
> + break;
> }
> +
> + return ret;
> }
>
> static int inv_mpu6050_write_gyro_scale(struct inv_mpu6050_state *st, int val)
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
