lkml.org 
[lkml]   [2013]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 04/11] iio: pressure-i2c: st: Simplify error checking in probe()

    > Hi Lee. This won't apply as this driver has already been cleaned up using devm_iio_device_alloc.
    >
    > Guessing you are basing on an old tree?
    > Always use at least staging-next for IIO patches.

    Sure, I'll rebase and resubmit the set once all the other creases have
    been ironed out.

    > I think this one will hit mainline in next few days.

    Okay, great.

    > Lee Jones <lee.jones@linaro.org> wrote:
    > >Strip out all the unnecessary gotos and check for NULL returns in the
    > >usual manner.
    > >
    > >Signed-off-by: Lee Jones <lee.jones@linaro.org>
    > >---
    > > drivers/iio/pressure/st_pressure_i2c.c | 17 ++++++-----------
    > > 1 file changed, 6 insertions(+), 11 deletions(-)
    > >
    > >diff --git a/drivers/iio/pressure/st_pressure_i2c.c
    > >b/drivers/iio/pressure/st_pressure_i2c.c
    > >index 7cebcc7..2ace770 100644
    > >--- a/drivers/iio/pressure/st_pressure_i2c.c
    > >+++ b/drivers/iio/pressure/st_pressure_i2c.c
    > >@@ -26,10 +26,8 @@ static int st_press_i2c_probe(struct i2c_client
    > >*client,
    > > int err;
    > >
    > > indio_dev = iio_device_alloc(sizeof(*pdata));
    > >- if (indio_dev == NULL) {
    > >- err = -ENOMEM;
    > >- goto iio_device_alloc_error;
    > >- }
    > >+ if (!indio_dev)
    > >+ return -ENOMEM;
    > >
    > > pdata = iio_priv(indio_dev);
    > > pdata->dev = &client->dev;
    > >@@ -37,15 +35,12 @@ static int st_press_i2c_probe(struct i2c_client
    > >*client,
    > > st_sensors_i2c_configure(indio_dev, client, pdata);
    > >
    > > err = st_press_common_probe(indio_dev);
    > >- if (err < 0)
    > >- goto st_press_common_probe_error;
    > >+ if (err < 0) {
    > >+ iio_device_free(indio_dev);
    > >+ return err;
    > >+ }
    > >
    > > return 0;
    > >-
    > >-st_press_common_probe_error:
    > >- iio_device_free(indio_dev);
    > >-iio_device_alloc_error:
    > >- return err;
    > > }
    > >
    > > static int st_press_i2c_remove(struct i2c_client *client)
    >

    --
    Lee Jones
    Linaro STMicroelectronics Landing Team Lead
    Linaro.org │ Open source software for ARM SoCs
    Follow Linaro: Facebook | Twitter | Blog
    --
    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/

    \
     
     \ /
      Last update: 2013-09-04 18:41    [W:2.382 / U:0.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site