Commit efd9566f authored by Lee Jones's avatar Lee Jones Committed by Jonathan Cameron

iio: sensors-core: st: Clean-up error handling in st_sensors_init_sensor()

Strip out all those unnecessary gotos and just return the error right away.

Aids to simplicity and reduces code.
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 38d1c6a9
...@@ -241,29 +241,28 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev, ...@@ -241,29 +241,28 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
err = st_sensors_set_enable(indio_dev, false); err = st_sensors_set_enable(indio_dev, false);
if (err < 0) if (err < 0)
goto init_error; return err;
if (sdata->current_fullscale) { if (sdata->current_fullscale) {
err = st_sensors_set_fullscale(indio_dev, err = st_sensors_set_fullscale(indio_dev,
sdata->current_fullscale->num); sdata->current_fullscale->num);
if (err < 0) if (err < 0)
goto init_error; return err;
} else } else
dev_info(&indio_dev->dev, "Full-scale not possible\n"); dev_info(&indio_dev->dev, "Full-scale not possible\n");
err = st_sensors_set_odr(indio_dev, sdata->odr); err = st_sensors_set_odr(indio_dev, sdata->odr);
if (err < 0) if (err < 0)
goto init_error; return err;
/* set BDU */ /* set BDU */
err = st_sensors_write_data_with_mask(indio_dev, err = st_sensors_write_data_with_mask(indio_dev,
sdata->sensor->bdu.addr, sdata->sensor->bdu.mask, true); sdata->sensor->bdu.addr, sdata->sensor->bdu.mask, true);
if (err < 0) if (err < 0)
goto init_error; return err;
err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS); err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
init_error:
return err; return err;
} }
EXPORT_SYMBOL(st_sensors_init_sensor); EXPORT_SYMBOL(st_sensors_init_sensor);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment