iio: gyro-core: st: Clean up error handling in probe()

Reduce the amount of those unnecessary goto calls, as in most cases
we can simply return immediately. We also only call for the IRQ number
once and use that value throughout.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index e13c2b0bf3d1..9f80817182cf 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -305,8 +305,9 @@ static const struct iio_trigger_ops st_gyro_trigger_ops = {
 int st_gyro_common_probe(struct iio_dev *indio_dev,
                                         struct st_sensors_platform_data *pdata)
 {
-        int err;
         struct st_sensor_data *gdata = iio_priv(indio_dev);
+        int irq = gdata->get_irq_data_ready(indio_dev);
+        int err;
 
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->info = &gyro_info;
@@ -314,7 +315,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
         err = st_sensors_check_device_support(indio_dev,
                                 ARRAY_SIZE(st_gyro_sensors), st_gyro_sensors);
         if (err < 0)
-                goto st_gyro_common_probe_error;
+                return err;
 
         gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
         gdata->multiread_bit = gdata->sensor->multi_read_bit;
@@ -327,12 +328,12 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 
         err = st_sensors_init_sensor(indio_dev, pdata);
         if (err < 0)
-                goto st_gyro_common_probe_error;
+                return err;
 
-        if (gdata->get_irq_data_ready(indio_dev) > 0) {
+        if (irq > 0) {
                 err = st_gyro_allocate_ring(indio_dev);
                 if (err < 0)
-                        goto st_gyro_common_probe_error;
+                        return err;
 
                 err = st_sensors_allocate_trigger(indio_dev,
                                                   ST_GYRO_TRIGGER_OPS);
@@ -344,15 +345,15 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
         if (err)
                 goto st_gyro_device_register_error;
 
-        return err;
+        return 0;
 
 st_gyro_device_register_error:
-        if (gdata->get_irq_data_ready(indio_dev) > 0)
+        if (irq > 0)
                 st_sensors_deallocate_trigger(indio_dev);
 st_gyro_probe_trigger_error:
-        if (gdata->get_irq_data_ready(indio_dev) > 0)
+        if (irq > 0)
                 st_gyro_deallocate_ring(indio_dev);
-st_gyro_common_probe_error:
+
         return err;
 }
 EXPORT_SYMBOL(st_gyro_common_probe);