From: Jonathan Cameron <jic23@kernel.org>
To: Brian Masney <masneyb@onstation.org>, linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
lars@metafoo.de, pmeerw@pmeerw.net, knaack.h@gmx.de,
linux-kernel@vger.kernel.org, Jon.Brenner@ams.com
Subject: Re: [PATCH v4 11/26] staging: iio: tsl2583: change newlines to improve readability
Date: Sun, 13 Nov 2016 12:15:02 +0000 [thread overview]
Message-ID: <eca28ac2-f624-9a52-cb9b-b3ec55cf24c8@kernel.org> (raw)
In-Reply-To: <1478974781-1457-12-git-send-email-masneyb@onstation.org>
On 12/11/16 18:19, Brian Masney wrote:
> Add and remove newlines to improve code readability in preparation for
> moving the driver out of staging.
>
> Signed-off-by: Brian Masney <masneyb@onstation.org>
Applied
> ---
> drivers/staging/iio/light/tsl2583.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
> index be3cbae..8303753 100644
> --- a/drivers/staging/iio/light/tsl2583.c
> +++ b/drivers/staging/iio/light/tsl2583.c
> @@ -202,7 +202,6 @@ static int tsl2583_get_lux(struct iio_dev *indio_dev)
> ret = i2c_smbus_write_byte(chip->client,
> (TSL2583_CMD_REG | TSL2583_CMD_SPL_FN |
> TSL2583_CMD_ALS_INT_CLR));
> -
> if (ret < 0) {
> dev_err(&chip->client->dev, "%s: failed to clear the interrupt bit\n",
> __func__);
> @@ -225,8 +224,10 @@ static int tsl2583_get_lux(struct iio_dev *indio_dev)
> chip->als_cur_info.lux = 0;
> goto done;
> }
> +
> /* calculate ratio */
> ratio = (ch1 << 15) / ch0;
> +
> /* convert to unscaled lux using the pointer to the table */
> for (p = (struct tsl2583_lux *)tsl2583_device_lux;
> p->ratio != 0 && p->ratio < ratio; p++)
> @@ -273,6 +274,7 @@ static int tsl2583_get_lux(struct iio_dev *indio_dev)
> lux64 >>= 13;
> lux = lux64;
> lux = (lux + 500) / 1000;
> +
> if (lux > TSL2583_LUX_CALC_OVER_FLOW) { /* check for overflow */
> return_max:
> lux = TSL2583_LUX_CALC_OVER_FLOW;
> @@ -319,21 +321,23 @@ static int tsl2583_als_calibrate(struct iio_dev *indio_dev)
> __func__);
> return -ENODATA;
> }
> +
> lux_val = tsl2583_get_lux(indio_dev);
> if (lux_val < 0) {
> dev_err(&chip->client->dev, "%s: failed to get lux\n",
> __func__);
> return lux_val;
> }
> +
> gain_trim_val = (unsigned int)(((chip->als_settings.als_cal_target)
> * chip->als_settings.als_gain_trim) / lux_val);
> -
> if ((gain_trim_val < 250) || (gain_trim_val > 4000)) {
> dev_err(&chip->client->dev,
> "%s: trim_val of %d is not within the range [250, 4000]\n",
> __func__, gain_trim_val);
> return -ENODATA;
> }
> +
> chip->als_settings.als_gain_trim = (int)gain_trim_val;
>
> return (int)gain_trim_val;
> @@ -529,6 +533,7 @@ static ssize_t in_illuminance_lux_table_show(struct device *dev,
> }
>
> offset += sprintf(buf + offset, "\n");
> +
> return offset;
> }
>
> @@ -776,6 +781,7 @@ static int tsl2583_probe(struct i2c_client *clientp,
> indio_dev = devm_iio_device_alloc(&clientp->dev, sizeof(*chip));
> if (!indio_dev)
> return -ENOMEM;
> +
> chip = iio_priv(indio_dev);
> chip->client = clientp;
> i2c_set_clientdata(clientp, indio_dev);
> @@ -803,6 +809,7 @@ static int tsl2583_probe(struct i2c_client *clientp,
> indio_dev->dev.parent = &clientp->dev;
> indio_dev->modes = INDIO_DIRECT_MODE;
> indio_dev->name = chip->client->name;
> +
> ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
> if (ret) {
> dev_err(&clientp->dev, "%s: iio registration failed\n",
> @@ -819,6 +826,7 @@ static int tsl2583_probe(struct i2c_client *clientp,
> return ret;
>
> dev_info(&clientp->dev, "Light sensor found.\n");
> +
> return 0;
> }
>
> @@ -834,6 +842,7 @@ static int __maybe_unused tsl2583_suspend(struct device *dev)
> chip->suspended = true;
>
> mutex_unlock(&chip->als_mutex);
> +
> return ret;
> }
>
> @@ -848,6 +857,7 @@ static int __maybe_unused tsl2583_resume(struct device *dev)
> ret = tsl2583_chip_init_and_power_on(indio_dev);
>
> mutex_unlock(&chip->als_mutex);
> +
> return ret;
> }
>
>
next prev parent reply other threads:[~2016-11-13 12:15 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-12 18:19 [PATCH v4 00/26] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-12 18:19 ` [PATCH v4 01/26] staging: iio: tsl2583: check if chip is in a working state in in_illuminance_calibrate_store Brian Masney
2016-11-13 11:54 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 02/26] staging: iio: tsl2583: remove unnecessary chip status check in taos_get_lux Brian Masney
2016-11-13 11:55 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 03/26] staging: iio: tsl2583: remove unnecessary chip status checks in suspend/resume Brian Masney
2016-11-13 11:56 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 04/26] staging: iio: tsl2583: change current chip state from a tristate to a bool Brian Masney
2016-11-13 11:58 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 05/26] staging: iio: tsl2583: remove redundant write to the control register in taos_probe() Brian Masney
2016-11-13 12:06 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 06/26] staging: iio: tsl2583: remove the FSF's mailing address Brian Masney
2016-11-13 12:07 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 07/26] staging: iio: tsl2583: cleaned up logging Brian Masney
2016-11-13 12:07 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 08/26] staging: iio: tsl2583: unify function and variable prefix to tsl2583_ Brian Masney
2016-11-13 12:09 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 09/26] staging: iio: tsl2583: fix alignment of #define values Brian Masney
2016-11-13 12:13 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 10/26] staging: iio: tsl2583: fix comparison between signed and unsigned integers Brian Masney
2016-11-13 12:14 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 11/26] staging: iio: tsl2583: change newlines to improve readability Brian Masney
2016-11-13 12:15 ` Jonathan Cameron [this message]
2016-11-12 18:19 ` [PATCH v4 12/26] staging: iio: tsl2583: combine sysfs documentation Brian Masney
2016-11-13 12:16 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 13/26] staging: iio: tsl2583: fix multiline comment syntax Brian Masney
2016-11-13 12:17 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 14/26] staging: iio: tsl2583: updated code comment to match what the code does Brian Masney
2016-11-13 12:18 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 15/26] staging: iio: tsl2583: moved code block inside else statement Brian Masney
2016-11-13 12:20 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 16/26] staging: iio: tsl2583: change tsl2583_als_calibrate() to return 0 on success Brian Masney
2016-11-13 12:21 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 17/26] staging: iio: tsl2583: remove unnecessary parentheses Brian Masney
2016-11-13 12:22 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 18/26] staging: iio: tsl2583: don't assume an unsigned int is 32 bits Brian Masney
2016-11-13 12:23 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 19/26] staging: iio: tsl2583: move from a global to a per device lux table Brian Masney
2016-11-13 12:25 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 20/26] staging: iio: tsl2583: add tsl2583 to list of supported devices in the header Brian Masney
2016-11-13 12:28 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 21/26] staging: iio: tsl2583: clarified comment about clearing interrupts Brian Masney
2016-11-13 12:28 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 22/26] staging: iio: tsl2583: remove comment for tsl2583_probe() Brian Masney
2016-11-13 12:29 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 23/26] staging: iio: tsl2583: remove unnecessary memset call Brian Masney
2016-11-13 12:29 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 24/26] staging: iio: tsl2583: remove unnecessary variable initialization Brian Masney
2016-11-13 12:30 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 25/26] staging: iio: tsl2583: add copyright and MODULE_AUTHOR Brian Masney
2016-11-13 12:35 ` Jonathan Cameron
2016-11-12 18:19 ` [PATCH v4 26/26] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-13 12:57 ` Jonathan Cameron
2016-11-13 16:18 ` Brian Masney
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=eca28ac2-f624-9a52-cb9b-b3ec55cf24c8@kernel.org \
--to=jic23@kernel.org \
--cc=Jon.Brenner@ams.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--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).