From: Jonathan Cameron <jic23@kernel.org>
To: Brian Masney <masneyb@onstation.org>, linux-iio@vger.kernel.org
Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-kernel@vger.kernel.org, ldewangan@nvidia.com
Subject: Re: [PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling()
Date: Sun, 4 Dec 2016 11:50:05 +0000 [thread overview]
Message-ID: <b06942c2-623e-49a4-811d-be292c743725@kernel.org> (raw)
In-Reply-To: <1480817983-32359-14-git-send-email-masneyb@onstation.org>
On 04/12/16 02:19, Brian Masney wrote:
> When isl29028_set_proxim_sampling() fails, it was up to both callers to
> log the failure message. This patch moves the logging into
> isl29028_set_proxim_sampling() to reduce the overall amount of code in
> the driver.
>
> Signed-off-by: Brian Masney <masneyb@onstation.org>
Minor point inline.
> ---
> drivers/staging/iio/light/isl29028.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
> index 23a4db8..0c8a878 100644
> --- a/drivers/staging/iio/light/isl29028.c
> +++ b/drivers/staging/iio/light/isl29028.c
> @@ -79,18 +79,28 @@ struct isl29028_chip {
> static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
> unsigned int sampling)
> {
> + struct device *dev = regmap_get_device(chip->regmap);
> static unsigned int prox_period[] = {800, 400, 200, 100, 75, 50, 12, 0};
> unsigned int sel;
> unsigned int period = DIV_ROUND_UP(1000, sampling);
> + int ret;
>
> for (sel = 0; sel < ARRAY_SIZE(prox_period); ++sel) {
> if (period >= prox_period[sel])
> break;
> }
>
> - return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
> - ISL29028_CONF_PROX_SLP_MASK,
> - sel << ISL29028_CONF_PROX_SLP_SH);
> + ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
> + ISL29028_CONF_PROX_SLP_MASK,
> + sel << ISL29028_CONF_PROX_SLP_SH);
> + if (ret < 0)
> + dev_err(dev,
> + "%s(): Error %d setting the proximity sampling\n",
> + __func__, ret);
I'd prefer the cleaner style or a return inside this if statement and dropping the
else.
> + else
> + chip->prox_sampling = sampling;
> +
> + return ret;
> }
>
> static int isl29028_enable_proximity(struct isl29028_chip *chip)
> @@ -296,14 +306,6 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
> }
>
> ret = isl29028_set_proxim_sampling(chip, val);
> - if (ret < 0) {
> - dev_err(dev,
> - "Setting proximity samp_freq fail, err %d\n",
> - ret);
> - break;
> - }
> -
> - chip->prox_sampling = val;
> break;
> case IIO_LIGHT:
> if (mask != IIO_CHAN_INFO_SCALE) {
> @@ -452,10 +454,8 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip)
> }
>
> ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling);
> - if (ret < 0) {
> - dev_err(dev, "setting the proximity, err = %d\n", ret);
> + if (ret < 0)
> return ret;
> - }
>
> ret = isl29028_set_als_scale(chip, chip->lux_scale);
> if (ret < 0)
>
next prev parent reply other threads:[~2017-01-08 9:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 2:19 [PATCH 00/19] staging: iio: isl29028: staging cleanups Brian Masney
2016-12-04 2:19 ` [PATCH 01/19] staging: iio: isl29028: remove nested if statements Brian Masney
2016-12-04 11:01 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 02/19] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity() Brian Masney
2016-12-04 11:13 ` Jonathan Cameron
2016-12-04 11:16 ` Jonathan Cameron
2017-01-14 20:00 ` Brian Masney
2017-01-15 14:33 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 03/19] staging: iio: isl29028: remove chip test and defaults from isl29028_chip_init() Brian Masney
2016-12-04 11:23 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 04/19] staging: iio: isl29028: add power management support Brian Masney
2016-12-04 11:37 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 05/19] staging: iio: isl29028: made alignment of #defines consistent Brian Masney
2016-12-04 11:39 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 06/19] staging: iio: isl29028: made alignment of variables in struct isl29028_chip consistent Brian Masney
2016-12-04 2:19 ` [PATCH 07/19] staging: iio: isl29028: fix alignment of function arguments Brian Masney
2016-12-04 2:19 ` [PATCH 08/19] staging: iio: isl29028: combine isl29028_proxim_get() and isl29028_read_proxim() Brian Masney
2016-12-04 2:19 ` [PATCH 09/19] staging: iio: isl29028: change newlines to improve readability Brian Masney
2016-12-04 2:19 ` [PATCH 10/19] staging: iio: isl29028: remove unused define ISL29028_DEV_ATTR Brian Masney
2016-12-04 2:19 ` [PATCH 11/19] staging: iio: isl29028: made column alignment in isl29028_channels consistent Brian Masney
2016-12-04 11:48 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 12/19] staging: iio: isl29028: fix comparison between signed and unsigned integers Brian Masney
2016-12-05 20:53 ` Dan Carpenter
2016-12-06 0:10 ` Brian Masney
2016-12-06 10:19 ` Dan Carpenter
2016-12-04 2:19 ` [PATCH 13/19] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() Brian Masney
2016-12-04 11:50 ` Jonathan Cameron [this message]
2016-12-04 2:19 ` [PATCH 14/19] staging: iio: isl29028: move failure logging into isl29028_set_als_scale() Brian Masney
2016-12-04 11:51 ` Jonathan Cameron
2016-12-04 2:19 ` [PATCH 15/19] staging: iio: isl29028: made error messages consistent Brian Masney
2016-12-04 2:19 ` [PATCH 16/19] staging: iio: isl29028: remove unnecessary error logging in isl29028_chip_init_and_power_on() Brian Masney
2016-12-04 2:19 ` [PATCH 17/19] staging: iio: isl29028: remove out of memory log message Brian Masney
2016-12-04 2:19 ` [PATCH 18/19] staging: iio: isl29028: remove unnecessary parenthesis Brian Masney
2016-12-04 2:19 ` [PATCH 19/19] staging: iio: isl29028: remove legacy device tree binding Brian Masney
2016-12-04 11:55 ` Jonathan Cameron
2017-01-08 9:50 ` Jonathan Cameron
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=b06942c2-623e-49a4-811d-be292c743725@kernel.org \
--to=jic23@kernel.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=ldewangan@nvidia.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=pmeerw@pmeerw.net \
/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).