From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:57396 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752648Ab3IUL5N (ORCPT ); Sat, 21 Sep 2013 07:57:13 -0400 Message-ID: <523D97BD.5090606@kernel.org> Date: Sat, 21 Sep 2013 13:57:33 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Lee Jones CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, jic23@cam.ac.uk, arnd@arndb.de, linus.walleij@linaro.org, denis.ciocca@st.com, linux-iio@vger.kernel.org Subject: Re: [PATCH 20/20] iio: magn-core: st: Clean up error handling in probe() References: <1379347346-823-1-git-send-email-lee.jones@linaro.org> <1379347346-823-21-git-send-email-lee.jones@linaro.org> In-Reply-To: <1379347346-823-21-git-send-email-lee.jones@linaro.org> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 09/16/13 17:02, Lee Jones wrote: > 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 Applied to the togreg branch of iio.git Thanks, > --- > drivers/iio/magnetometer/st_magn_core.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c > index e8d2849..729c71a 100644 > --- a/drivers/iio/magnetometer/st_magn_core.c > +++ b/drivers/iio/magnetometer/st_magn_core.c > @@ -348,8 +348,9 @@ static const struct iio_info magn_info = { > int st_magn_common_probe(struct iio_dev *indio_dev, > struct st_sensors_platform_data *pdata) > { > - int err; > struct st_sensor_data *mdata = iio_priv(indio_dev); > + int irq = mdata->get_irq_data_ready(indio_dev); > + int err; > > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->info = &magn_info; > @@ -357,7 +358,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev, > err = st_sensors_check_device_support(indio_dev, > ARRAY_SIZE(st_magn_sensors), st_magn_sensors); > if (err < 0) > - goto st_magn_common_probe_error; > + return err; > > mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS; > mdata->multiread_bit = mdata->sensor->multi_read_bit; > @@ -370,12 +371,12 @@ int st_magn_common_probe(struct iio_dev *indio_dev, > > err = st_sensors_init_sensor(indio_dev, pdata); > if (err < 0) > - goto st_magn_common_probe_error; > + return err; > > - if (mdata->get_irq_data_ready(indio_dev) > 0) { > + if (irq > 0) { > err = st_magn_allocate_ring(indio_dev); > if (err < 0) > - goto st_magn_common_probe_error; > + return err; > err = st_sensors_allocate_trigger(indio_dev, NULL); > if (err < 0) > goto st_magn_probe_trigger_error; > @@ -385,15 +386,15 @@ int st_magn_common_probe(struct iio_dev *indio_dev, > if (err) > goto st_magn_device_register_error; > > - return err; > + return 0; > > st_magn_device_register_error: > - if (mdata->get_irq_data_ready(indio_dev) > 0) > + if (irq > 0) > st_sensors_deallocate_trigger(indio_dev); > st_magn_probe_trigger_error: > - if (mdata->get_irq_data_ready(indio_dev) > 0) > + if (irq > 0) > st_magn_deallocate_ring(indio_dev); > -st_magn_common_probe_error: > + > return err; > } > EXPORT_SYMBOL(st_magn_common_probe); >