From: Peter Meerwald <pmeerw@pmeerw.net>
To: linux-iio@vger.kernel.org
Cc: Peter Meerwald <pmeerw@pmeerw.net>
Subject: [PATCH 15/18] staging:iio:hmc5843: Reorganize _set_meas_conf()
Date: Tue, 3 Sep 2013 03:05:17 +0200 [thread overview]
Message-ID: <1378170320-27538-16-git-send-email-pmeerw@pmeerw.net> (raw)
In-Reply-To: <1378170320-27538-1-git-send-email-pmeerw@pmeerw.net>
move locking inside _set() function
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
drivers/staging/iio/magnetometer/hmc5843.c | 42 +++++++++++++---------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index a88473b..00e2225 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -264,19 +264,24 @@ static int hmc5843_read_measurement(struct hmc5843_data *data,
*/
static s32 hmc5843_set_meas_conf(struct hmc5843_data *data, u8 meas_conf)
{
- u8 reg_val;
- reg_val = (meas_conf & HMC5843_MEAS_CONF_MASK) |
- (data->rate << HMC5843_RATE_OFFSET);
- return i2c_smbus_write_byte_data(data->client, HMC5843_CONFIG_REG_A,
- reg_val);
+ int ret;
+
+ mutex_lock(&data->lock);
+ ret = i2c_smbus_write_byte_data(data->client, HMC5843_CONFIG_REG_A,
+ (meas_conf & HMC5843_MEAS_CONF_MASK) |
+ (data->rate << HMC5843_RATE_OFFSET));
+ if (ret >= 0)
+ data->meas_conf = meas_conf;
+ mutex_unlock(&data->lock);
+
+ return ret;
}
static ssize_t hmc5843_show_measurement_configuration(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct hmc5843_data *data = iio_priv(indio_dev);
+ struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev));
return sprintf(buf, "%d\n", data->meas_conf);
}
@@ -285,28 +290,19 @@ static ssize_t hmc5843_set_measurement_configuration(struct device *dev,
const char *buf,
size_t count)
{
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct hmc5843_data *data = iio_priv(indio_dev);
+ struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev));
unsigned long meas_conf = 0;
- int error;
+ int ret;
- error = kstrtoul(buf, 10, &meas_conf);
- if (error)
- return error;
+ ret = kstrtoul(buf, 10, &meas_conf);
+ if (ret)
+ return ret;
if (meas_conf >= HMC5843_MEAS_CONF_NOT_USED)
return -EINVAL;
- mutex_lock(&data->lock);
- dev_dbg(dev, "set measurement configuration to %lu\n", meas_conf);
- if (hmc5843_set_meas_conf(data, meas_conf)) {
- count = -EINVAL;
- goto exit;
- }
- data->meas_conf = meas_conf;
+ ret = hmc5843_set_meas_conf(data, meas_conf);
-exit:
- mutex_unlock(&data->lock);
- return count;
+ return (ret < 0) ? ret : count;
}
static IIO_DEVICE_ATTR(meas_conf,
--
1.7.9.5
next prev parent reply other threads:[~2013-09-03 1:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-03 1:05 [PATCH 00/18] Cleanup hmc5843 magnetometer driver in staging Peter Meerwald
2013-09-03 1:05 ` [PATCH 01/18] staging:iio:hmc5843: Fix measurement conversion Peter Meerwald
2013-09-05 19:18 ` Lars-Peter Clausen
2013-09-11 21:57 ` Jonathan Cameron
2013-09-03 1:05 ` [PATCH 02/18] staging:iio:hmc5843: Use devm_iio_device_alloc Peter Meerwald
2013-09-11 22:02 ` Jonathan Cameron
2013-09-03 1:05 ` [PATCH 03/18] staging:iio:hmc5843: Add pointer to i2c client to data struct Peter Meerwald
2013-09-11 22:07 ` Jonathan Cameron
2013-09-03 1:05 ` [PATCH 04/18] staging:iio:hmc5843: Rewrite init function Peter Meerwald
2013-09-03 1:05 ` [PATCH 05/18] staging:iio:hmc5843: Use INFO_SAMP_FREQ Peter Meerwald
2013-09-03 1:05 ` [PATCH 06/18] staging:iio:hmc5843: Remove unused LSB register #defines Peter Meerwald
2013-09-03 1:05 ` [PATCH 07/18] staging:iio:hmc5843: Tighten comments Peter Meerwald
2013-09-03 1:05 ` [PATCH 08/18] staging:iio:hmc5843: Introduce helper functions to show/check list of int pairs Peter Meerwald
2013-09-03 1:05 ` [PATCH 09/18] staging:iio:hmc5843: Use CALIBSCALE instead of magn_range Peter Meerwald
2013-09-12 21:07 ` Jonathan Cameron
2013-09-03 1:05 ` [PATCH 10/18] staging:iio:hmc5843: Always read all channels values otherwise no updates Peter Meerwald
2013-09-03 1:05 ` [PATCH 11/18] staging:iio:hmc5843: Add trigger handling Peter Meerwald
2013-09-12 22:01 ` Jonathan Cameron
2013-09-03 1:05 ` [PATCH 12/18] staging:iio:hmc5843: Fix format of MODULE_AUTHOR's email Peter Meerwald
2013-09-03 1:05 ` [PATCH 13/18] staging:iio:hmc5843: Remove ability to change operating mode Peter Meerwald
2013-09-03 1:05 ` [PATCH 14/18] staging:iio:hmc5843: Rename _configure() to _set_mode() Peter Meerwald
2013-09-03 1:05 ` Peter Meerwald [this message]
2013-09-03 1:05 ` [PATCH 16/18] staging:iio:hmc5843: Rename _set_rate() to _set_samp_freq() Peter Meerwald
2013-09-03 1:05 ` [PATCH 17/18] staging:iio:hmc5843: Introduce _set_range_gain() Peter Meerwald
2013-09-03 1:05 ` [PATCH 18/18] staging:iio:hmc5843: Check initialization and chip identifier Peter Meerwald
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=1378170320-27538-16-git-send-email-pmeerw@pmeerw.net \
--to=pmeerw@pmeerw.net \
--cc=linux-iio@vger.kernel.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).