From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Daniel Campello <campello@chromium.org>
Cc: LKML <devicetree@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Douglas Anderson <dianders@chromium.org>,
Enrico Granata <egranata@chromium.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Stephen Boyd <swboyd@chromium.org>,
linux-iio <linux-iio@vger.kernel.org>
Subject: Re: [PATCH 10/15] iio: sx9310: Simplify error return handling
Date: Tue, 28 Jul 2020 21:15:07 +0300 [thread overview]
Message-ID: <CAHp75VeWpMPFxsP67FVsm_+jJOxkChj-e7UJ4mbBXzFGqLNd7w@mail.gmail.com> (raw)
In-Reply-To: <20200728091057.10.Ibe84fae61cd914c116e6d59ffeb644f1cbecd601@changeid>
On Tue, Jul 28, 2020 at 6:14 PM Daniel Campello <campello@chromium.org> wrote:
>
> Checks for non-zero return values to signal error conditions.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Daniel Campello <campello@chromium.org>
> ---
>
> drivers/iio/proximity/sx9310.c | 52 +++++++++++++++++-----------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
> index 31234691a31abf..051c6515e62c18 100644
> --- a/drivers/iio/proximity/sx9310.c
> +++ b/drivers/iio/proximity/sx9310.c
> @@ -338,7 +338,7 @@ static int sx9310_read_prox_data(struct sx9310_data *data,
> int ret;
>
> ret = regmap_write(data->regmap, SX9310_REG_SENSOR_SEL, chan->channel);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> return regmap_bulk_read(data->regmap, chan->address, val, sizeof(*val));
> @@ -354,7 +354,7 @@ static int sx9310_wait_for_sample(struct sx9310_data *data)
> unsigned int val;
>
> ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, &val);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> val = (val & SX9310_REG_PROX_CTRL0_SCANPERIOD_MASK) >>
> @@ -368,13 +368,13 @@ static int sx9310_wait_for_sample(struct sx9310_data *data)
> static int sx9310_read_proximity(struct sx9310_data *data,
> const struct iio_chan_spec *chan, int *val)
> {
> - int ret = 0;
> + int ret;
> __be16 rawval;
>
> mutex_lock(&data->mutex);
>
> ret = sx9310_get_read_channel(data, chan->channel);
> - if (ret < 0)
> + if (ret)
> goto out;
>
> if (data->client->irq) {
> @@ -394,11 +394,11 @@ static int sx9310_read_proximity(struct sx9310_data *data,
>
> mutex_lock(&data->mutex);
>
> - if (ret < 0)
> + if (ret)
> goto out_disable_irq;
>
> ret = sx9310_read_prox_data(data, chan, &rawval);
> - if (ret < 0)
> + if (ret)
> goto out_disable_irq;
>
> *val = sign_extend32(be16_to_cpu(rawval),
> @@ -411,7 +411,7 @@ static int sx9310_read_proximity(struct sx9310_data *data,
> }
>
> ret = sx9310_put_read_channel(data, chan->channel);
> - if (ret < 0)
> + if (ret)
> goto out;
>
> mutex_unlock(&data->mutex);
> @@ -434,7 +434,7 @@ static int sx9310_read_samp_freq(struct sx9310_data *data, int *val, int *val2)
> unsigned int regval;
> int ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, ®val);
>
> - if (ret < 0)
> + if (ret)
> return ret;
>
> regval = (regval & SX9310_REG_PROX_CTRL0_SCANPERIOD_MASK) >>
> @@ -535,7 +535,7 @@ static void sx9310_push_events(struct iio_dev *indio_dev)
>
> /* Read proximity state on all channels */
> ret = regmap_read(data->regmap, SX9310_REG_STAT0, &val);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&data->client->dev, "i2c transfer error in irq\n");
> return;
> }
> @@ -570,7 +570,7 @@ static irqreturn_t sx9310_irq_thread_handler(int irq, void *private)
> mutex_lock(&data->mutex);
>
> ret = regmap_read(data->regmap, SX9310_REG_IRQ_SRC, &val);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&data->client->dev, "i2c transfer error in irq\n");
> goto out;
> }
> @@ -613,20 +613,20 @@ static int sx9310_write_event_config(struct iio_dev *indio_dev,
> mutex_lock(&data->mutex);
> if (state) {
> ret = sx9310_get_event_channel(data, chan->channel);
> - if (ret < 0)
> + if (ret)
> goto out_unlock;
> if (!(data->chan_event & ~BIT(chan->channel))) {
> ret = sx9310_enable_irq(data, eventirq);
> - if (ret < 0)
> + if (ret)
> sx9310_put_event_channel(data, chan->channel);
> }
> } else {
> ret = sx9310_put_event_channel(data, chan->channel);
> - if (ret < 0)
> + if (ret)
> goto out_unlock;
> if (!data->chan_event) {
> ret = sx9310_disable_irq(data, eventirq);
> - if (ret < 0)
> + if (ret)
> sx9310_get_event_channel(data, chan->channel);
> }
> }
> @@ -665,7 +665,7 @@ static int sx9310_set_trigger_state(struct iio_trigger *trig, bool state)
> ret = sx9310_enable_irq(data, SX9310_CONVDONE_IRQ);
> else if (!data->chan_read)
> ret = sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
> - if (ret < 0)
> + if (ret)
> goto out;
>
> data->trigger_enabled = state;
> @@ -694,7 +694,7 @@ static irqreturn_t sx9310_trigger_handler(int irq, void *private)
> indio_dev->masklength) {
> ret = sx9310_read_prox_data(data, &indio_dev->channels[bit],
> &val);
> - if (ret < 0)
> + if (ret)
> goto out;
>
> data->buffer[i++] = val;
> @@ -801,13 +801,13 @@ static int sx9310_init_compensation(struct iio_dev *indio_dev)
> unsigned int ctrl0;
>
> ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, &ctrl0);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> /* run the compensation phase on all channels */
> ret = regmap_write(data->regmap, SX9310_REG_PROX_CTRL0,
> ctrl0 | SX9310_REG_PROX_CTRL0_SENSOREN_MASK);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> ret = regmap_read_poll_timeout(data->regmap, SX9310_REG_STAT1, val,
> @@ -833,21 +833,21 @@ static int sx9310_init_device(struct iio_dev *indio_dev)
> unsigned int i, val;
>
> ret = regmap_write(data->regmap, SX9310_REG_RESET, SX9310_SOFT_RESET);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> usleep_range(1000, 2000); /* power-up time is ~1ms. */
>
> /* Clear reset interrupt state by reading SX9310_REG_IRQ_SRC. */
> ret = regmap_read(data->regmap, SX9310_REG_IRQ_SRC, &val);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> /* Program some sane defaults. */
> for (i = 0; i < ARRAY_SIZE(sx9310_default_regs); i++) {
> initval = &sx9310_default_regs[i];
> ret = regmap_write(data->regmap, initval->reg, initval->def);
> - if (ret < 0)
> + if (ret)
> return ret;
> }
>
> @@ -901,14 +901,14 @@ static int sx9310_probe(struct i2c_client *client)
> return PTR_ERR(data->regmap);
>
> ret = regmap_read(data->regmap, SX9310_REG_WHOAMI, &data->whoami);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&client->dev, "error in reading WHOAMI register: %d",
> ret);
> return ret;
> }
>
> ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, data->whoami);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> ACPI_COMPANION_SET(&indio_dev->dev, ACPI_COMPANION(&client->dev));
> @@ -920,7 +920,7 @@ static int sx9310_probe(struct i2c_client *client)
> i2c_set_clientdata(client, indio_dev);
>
> ret = sx9310_init_device(indio_dev);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> if (client->irq) {
> @@ -929,7 +929,7 @@ static int sx9310_probe(struct i2c_client *client)
> sx9310_irq_thread_handler,
> IRQF_TRIGGER_LOW | IRQF_ONESHOT,
> "sx9310_event", indio_dev);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> data->trig =
> @@ -951,7 +951,7 @@ static int sx9310_probe(struct i2c_client *client)
> iio_pollfunc_store_time,
> sx9310_trigger_handler,
> &sx9310_buffer_setup_ops);
> - if (ret < 0)
> + if (ret)
> return ret;
>
> return devm_iio_device_register(&client->dev, indio_dev);
> --
> 2.28.0.rc0.142.g3c755180ce-goog
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-07-28 18:15 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200724183954.1.I2e29ae25368ba8a72a9e44121cfbc36ead8ecc6b@changeid>
2020-07-28 15:12 ` [PATCH 00/15] sx9310 iio driver updates Daniel Campello
2020-07-28 15:12 ` [PATCH 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-28 22:06 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 19:42 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-07-28 18:08 ` Andy Shevchenko
2020-07-28 20:07 ` Daniel Campello
2020-07-28 20:15 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-28 18:09 ` Andy Shevchenko
2020-07-28 20:47 ` Daniel Campello
2020-07-28 21:28 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 18:10 ` Andy Shevchenko
2020-07-28 19:32 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 06/15] iio: sx9310: Align memory Daniel Campello
2020-07-28 18:11 ` Andy Shevchenko
2020-07-28 21:26 ` Daniel Campello
2020-07-29 6:52 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-28 18:13 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 18:14 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 09/15] iio: sx9310: Update copyright Daniel Campello
2020-07-28 15:12 ` [PATCH 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-28 18:15 ` Andy Shevchenko [this message]
2020-07-28 19:40 ` Stephen Boyd
2020-07-28 21:23 ` Daniel Campello
2020-07-28 21:32 ` Stephen Boyd
2020-07-28 22:06 ` Daniel Campello
2020-07-28 15:12 ` [PATCH 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 13/15] iio: sx9310: Add newlines to printks Daniel Campello
2020-07-28 18:19 ` Andy Shevchenko
2020-07-28 18:24 ` Joe Perches
2020-07-28 18:32 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 14/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 18:20 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 15/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-28 18:21 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 00/14] sx9310 iio driver updates Daniel Campello
2020-07-28 23:05 ` [PATCH v2 01/14] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-29 0:52 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 02/14] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 23:05 ` [PATCH v2 03/14] iio: sx9310: Fix irq handling Daniel Campello
2020-07-29 8:40 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 04/14] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-29 6:54 ` Andy Shevchenko
2020-07-29 8:38 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 05/14] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 23:05 ` [PATCH v2 06/14] iio: sx9310: Fixes various memory handling Daniel Campello
2020-07-28 23:05 ` [PATCH v2 07/14] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-29 1:03 ` Stephen Boyd
2020-07-29 7:00 ` Andy Shevchenko
2020-07-31 15:44 ` Daniel Campello
2020-07-31 15:52 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 08/14] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 23:05 ` [PATCH v2 09/14] iio: sx9310: Update copyright Daniel Campello
2020-07-28 23:05 ` [PATCH v2 10/14] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-29 8:42 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 11/14] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 23:05 ` [PATCH v2 12/14] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 23:05 ` [PATCH v2 13/14] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 23:05 ` [PATCH v2 14/14] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-29 0:50 ` [PATCH v2 00/14] sx9310 iio driver updates Stephen Boyd
2020-07-29 9:20 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHp75VeWpMPFxsP67FVsm_+jJOxkChj-e7UJ4mbBXzFGqLNd7w@mail.gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=campello@chromium.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=egranata@chromium.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).