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

iio: pressure-core: st: Clean-up probe() function

This patch contains some pretty basic clean-ups in probe() pertaining to
the simplification of error handling and a couple of readability adaptions.
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent caf5ca12
...@@ -232,16 +232,18 @@ static const struct iio_trigger_ops st_press_trigger_ops = { ...@@ -232,16 +232,18 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
int st_press_common_probe(struct iio_dev *indio_dev, int st_press_common_probe(struct iio_dev *indio_dev,
struct st_sensors_platform_data *plat_data) struct st_sensors_platform_data *plat_data)
{ {
int err;
struct st_sensor_data *pdata = iio_priv(indio_dev); struct st_sensor_data *pdata = iio_priv(indio_dev);
int irq = pdata->get_irq_data_ready(indio_dev);
int err;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &press_info; indio_dev->info = &press_info;
err = st_sensors_check_device_support(indio_dev, err = st_sensors_check_device_support(indio_dev,
ARRAY_SIZE(st_press_sensors), st_press_sensors); ARRAY_SIZE(st_press_sensors),
st_press_sensors);
if (err < 0) if (err < 0)
goto st_press_common_probe_error; return err;
pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
pdata->multiread_bit = pdata->sensor->multi_read_bit; pdata->multiread_bit = pdata->sensor->multi_read_bit;
...@@ -261,12 +263,12 @@ int st_press_common_probe(struct iio_dev *indio_dev, ...@@ -261,12 +263,12 @@ int st_press_common_probe(struct iio_dev *indio_dev,
err = st_sensors_init_sensor(indio_dev, plat_data); err = st_sensors_init_sensor(indio_dev, plat_data);
if (err < 0) if (err < 0)
goto st_press_common_probe_error; return err;
if (pdata->get_irq_data_ready(indio_dev) > 0) { if (irq > 0) {
err = st_press_allocate_ring(indio_dev); err = st_press_allocate_ring(indio_dev);
if (err < 0) if (err < 0)
goto st_press_common_probe_error; return err;
err = st_sensors_allocate_trigger(indio_dev, err = st_sensors_allocate_trigger(indio_dev,
ST_PRESS_TRIGGER_OPS); ST_PRESS_TRIGGER_OPS);
...@@ -281,12 +283,12 @@ int st_press_common_probe(struct iio_dev *indio_dev, ...@@ -281,12 +283,12 @@ int st_press_common_probe(struct iio_dev *indio_dev,
return err; return err;
st_press_device_register_error: st_press_device_register_error:
if (pdata->get_irq_data_ready(indio_dev) > 0) if (irq > 0)
st_sensors_deallocate_trigger(indio_dev); st_sensors_deallocate_trigger(indio_dev);
st_press_probe_trigger_error: st_press_probe_trigger_error:
if (pdata->get_irq_data_ready(indio_dev) > 0) if (irq > 0)
st_press_deallocate_ring(indio_dev); st_press_deallocate_ring(indio_dev);
st_press_common_probe_error:
return err; return err;
} }
EXPORT_SYMBOL(st_press_common_probe); EXPORT_SYMBOL(st_press_common_probe);
......
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