Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756777Ab3INP6s (ORCPT ); Sat, 14 Sep 2013 11:58:48 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:42696 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756321Ab3INP6r (ORCPT ); Sat, 14 Sep 2013 11:58:47 -0400 Message-ID: <523495D0.1050002@kernel.org> Date: Sat, 14 Sep 2013 17:58:56 +0100 From: Jonathan Cameron User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130806 Thunderbird/17.0.8 MIME-Version: 1.0 To: Lee Jones CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arnd@arndb.de, linus.walleij@linaro.org, denis.ciocca@st.com, linux-iio@vger.kernel.org Subject: Re: [PATCH 21/38] iio: sensors-core: st: Clean-up error handling in st_sensors_read_axis_data() References: <1378817379-8238-1-git-send-email-lee.jones@linaro.org> <1378817379-8238-22-git-send-email-lee.jones@linaro.org> In-Reply-To: <1378817379-8238-22-git-send-email-lee.jones@linaro.org> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2119 Lines: 61 On 09/10/13 13:49, Lee Jones wrote: > Gets rid of those unnecessary gotos. Unfortunately it introduced a bug whilst it is at it. Sometimes those gotos are necessary and the 'right' way to do things. > > Signed-off-by: Lee Jones > --- > drivers/iio/common/st_sensors/st_sensors_core.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c > index 8c4c54c..148f0e5 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_core.c > +++ b/drivers/iio/common/st_sensors/st_sensors_core.c > @@ -331,26 +331,23 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev, > unsigned int byte_for_channel = ch->scan_type.storagebits >> 3; > > outdata = kmalloc(byte_for_channel, GFP_KERNEL); > - if (!outdata) { > - err = -EINVAL; > - goto st_sensors_read_axis_data_error; > - } > + if (!outdata) > + return -ENOMEM; I agree this change makes complete sense. > > err = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev, > ch->address, byte_for_channel, > outdata, sdata->multiread_bit); > - if (err < 0) > - goto st_sensors_free_memory; > + if (err < 0) { > + kfree(outdata); > + return err; > + } I don't like this change as.... > > if (byte_for_channel == 2) > *data = (s16)get_unaligned_le16(outdata); > else if (byte_for_channel == 3) > *data = (s32)st_sensors_get_unaligned_le24(outdata); > > -st_sensors_free_memory: > - kfree(outdata); you now don't free out data in the case of no error. This is precisely the case where a goto is the correct way to handle things as the free need to occur whether or not the error occurs. > -st_sensors_read_axis_data_error: > - return err; > + return 0; > } > > int st_sensors_read_info_raw(struct iio_dev *indio_dev, > -- 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/