From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH v4 06/11] staging:iio:hmc5843: Rename _configure() to _set_mode()
Date: Thu, 17 Oct 2013 23:50:47 +0100 [thread overview]
Message-ID: <526069C7.8030902@kernel.org> (raw)
In-Reply-To: <1381961954-25596-7-git-send-email-pmeerw@pmeerw.net>
On 10/16/13 23:19, Peter Meerwald wrote:
> and be consistent with other setter functions in that first argument
> is hmc5843_data
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git
Thanks,
> ---
> drivers/staging/iio/magnetometer/hmc5843.c | 27 ++++++++++++++++-----------
> 1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index 5204b9a..d7ace70 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -131,12 +131,18 @@ struct hmc5843_data {
> };
>
> /* The lower two bits contain the current conversion mode */
> -static s32 hmc5843_configure(struct i2c_client *client,
> - u8 operating_mode)
> +static s32 hmc5843_set_mode(struct hmc5843_data *data, u8 operating_mode)
> {
> - return i2c_smbus_write_byte_data(client,
> - HMC5843_MODE_REG,
> + int ret;
> +
> + mutex_lock(&data->lock);
> + ret = i2c_smbus_write_byte_data(data->client, HMC5843_MODE_REG,
> operating_mode & HMC5843_MODE_MASK);
> + if (ret >= 0)
> + data->operating_mode = operating_mode;
> + mutex_unlock(&data->lock);
> +
> + return ret;
> }
>
> static int hmc5843_wait_measurement(struct hmc5843_data *data)
> @@ -495,7 +501,7 @@ static void hmc5843_init(struct hmc5843_data *data)
> {
> hmc5843_set_meas_conf(data, HMC5843_MEAS_CONF_NORMAL);
> hmc5843_set_rate(data, HMC5843_RATE_DEFAULT);
> - hmc5843_configure(data->client, HMC5843_MODE_CONVERSION_CONTINUOUS);
> + hmc5843_set_mode(data, HMC5843_MODE_CONVERSION_CONTINUOUS);
> i2c_smbus_write_byte_data(data->client, HMC5843_CONFIG_REG_B,
> HMC5843_RANGE_GAIN_DEFAULT);
> }
> @@ -562,7 +568,7 @@ static int hmc5843_remove(struct i2c_client *client)
> iio_triggered_buffer_cleanup(indio_dev);
>
> /* sleep mode to save power */
> - hmc5843_configure(client, HMC5843_MODE_SLEEP);
> + hmc5843_set_mode(iio_priv(indio_dev), HMC5843_MODE_SLEEP);
>
> return 0;
> }
> @@ -570,9 +576,10 @@ static int hmc5843_remove(struct i2c_client *client)
> #ifdef CONFIG_PM_SLEEP
> static int hmc5843_suspend(struct device *dev)
> {
> - hmc5843_configure(to_i2c_client(dev), HMC5843_MODE_SLEEP);
> + struct hmc5843_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
>
> - return 0;
> + return hmc5843_set_mode(data, HMC5843_MODE_SLEEP);
> }
>
> static int hmc5843_resume(struct device *dev)
> @@ -580,9 +587,7 @@ static int hmc5843_resume(struct device *dev)
> struct hmc5843_data *data = iio_priv(i2c_get_clientdata(
> to_i2c_client(dev)));
>
> - hmc5843_configure(data->client, data->operating_mode);
> -
> - return 0;
> + return hmc5843_set_mode(data, HMC5843_MODE_CONVERSION_CONTINUOUS);
> }
>
> static SIMPLE_DEV_PM_OPS(hmc5843_pm_ops, hmc5843_suspend, hmc5843_resume);
>
next prev parent reply other threads:[~2013-10-17 21:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 22:19 [PATCH v4 00/11] hmc5843 cleanup Peter Meerwald
2013-10-16 22:19 ` [PATCH v4 01/11] staging:iio:hmc5843: Use SCALE instead of magn_range Peter Meerwald
2013-10-17 22:46 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 02/11] staging:iio:hmc5843: Rename _check_samp_freq to get_samp_freq_index Peter Meerwald
2013-10-17 22:47 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 03/11] staging:iio:hmc5843: Always read all channels values otherwise no updates Peter Meerwald
2013-10-17 22:49 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 04/11] staging:iio:hmc5843: Add trigger handling Peter Meerwald
2013-10-17 22:49 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 05/11] staging:iio:hmc5843: Remove ability to change operating mode Peter Meerwald
2013-10-17 22:50 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 06/11] staging:iio:hmc5843: Rename _configure() to _set_mode() Peter Meerwald
2013-10-17 22:50 ` Jonathan Cameron [this message]
2013-10-16 22:19 ` [PATCH v4 07/11] staging:iio:hmc5843: Reorganize _set_meas_conf() Peter Meerwald
2013-10-17 22:51 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 08/11] staging:iio:hmc5843: Rename _set_rate() to _set_samp_freq() Peter Meerwald
2013-10-17 22:52 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 09/11] staging:iio:hmc5843: Introduce _set_range_gain() Peter Meerwald
2013-10-17 22:52 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 10/11] staging:iio:hmc5843: Check initialization and chip identifier Peter Meerwald
2013-10-17 22:52 ` Jonathan Cameron
2013-10-16 22:19 ` [PATCH v4 11/11] staging:iio:hmc5843: Trivial cleanup Peter Meerwald
2013-10-17 22:53 ` 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=526069C7.8030902@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.