Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753106Ab3IJQXv (ORCPT ); Tue, 10 Sep 2013 12:23:51 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:40261 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752963Ab3IJQXt (ORCPT ); Tue, 10 Sep 2013 12:23:49 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <1378817379-8238-27-git-send-email-lee.jones@linaro.org> References: <1378817379-8238-1-git-send-email-lee.jones@linaro.org> <1378817379-8238-27-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [PATCH 26/38] iio: pressure-core: st: Clean-up probe() function From: Jonathan Cameron Date: Tue, 10 Sep 2013 17:23:13 +0100 To: Lee Jones , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, jic23@cam.ac.uk CC: arnd@arndb.de, linus.walleij@linaro.org, denis.ciocca@st.com, linux-iio@vger.kernel.org Message-ID: <02cccf68-fdc6-4ac3-a5d7-adfa10fa1c46@email.android.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3365 Lines: 102 Lee Jones wrote: >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: Lee Jones >--- >drivers/iio/pressure/st_pressure_core.c | 32 >++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > >diff --git a/drivers/iio/pressure/st_pressure_core.c >b/drivers/iio/pressure/st_pressure_core.c >index 3abada2..6ffd949 100644 >--- a/drivers/iio/pressure/st_pressure_core.c >+++ b/drivers/iio/pressure/st_pressure_core.c >@@ -232,21 +232,23 @@ static const struct iio_trigger_ops >st_press_trigger_ops = { > int st_press_common_probe(struct iio_dev *indio_dev, > struct st_sensors_platform_data *plat_data) > { >- int err; > 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->info = &press_info; > > 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) >- goto st_press_common_probe_error; >+ return err; > > pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; >- pdata->multiread_bit = pdata->sensor->multi_read_bit; >- indio_dev->channels = pdata->sensor->ch; >- indio_dev->num_channels = pdata->sensor->num_ch; >+ pdata->multiread_bit = pdata->sensor->multi_read_bit; >+ indio_dev->channels = pdata->sensor->ch; >+ indio_dev->num_channels = pdata->sensor->num_ch; > > if (pdata->sensor->fs.addr != 0) > pdata->current_fullscale = (struct st_sensor_fullscale_avl *) >@@ -261,32 +263,30 @@ int st_press_common_probe(struct iio_dev >*indio_dev, > > err = st_sensors_init_sensor(indio_dev, plat_data); > 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); > if (err < 0) >- goto st_press_common_probe_error; >+ return err; > > err = st_sensors_allocate_trigger(indio_dev, >- ST_PRESS_TRIGGER_OPS); >+ ST_PRESS_TRIGGER_OPS); > if (err < 0) > goto st_press_probe_trigger_error; > } > > err = iio_device_register(indio_dev); >- if (err) This bit of handling is confusing. I would much rather see the if IRQ at the goto. Here the first thought is why is it not an error if there is no IRQ! >+ if (err && irq > 0) > goto st_press_device_register_error; > > return err; > > st_press_device_register_error: >- if (pdata->get_irq_data_ready(indio_dev) > 0) >- st_sensors_deallocate_trigger(indio_dev); >+ st_sensors_deallocate_trigger(indio_dev); > st_press_probe_trigger_error: >- if (pdata->get_irq_data_ready(indio_dev) > 0) >- st_press_deallocate_ring(indio_dev); >-st_press_common_probe_error: >+ st_press_deallocate_ring(indio_dev); >+ > return err; > } > EXPORT_SYMBOL(st_press_common_probe); -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/