From: Peter Meerwald <pmeerw@pmeerw.net>
To: linux-iio@vger.kernel.org
Cc: Peter Meerwald <pmeerw@pmeerw.net>
Subject: [PATCH 08/18] staging:iio:hmc5843: Introduce helper functions to show/check list of int pairs
Date: Tue, 3 Sep 2013 03:05:10 +0200 [thread overview]
Message-ID: <1378170320-27538-9-git-send-email-pmeerw@pmeerw.net> (raw)
In-Reply-To: <1378170320-27538-1-git-send-email-pmeerw@pmeerw.net>
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
drivers/staging/iio/magnetometer/hmc5843.c | 53 +++++++++++++++++-----------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 63a8956..bff03d5 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -356,24 +356,43 @@ static IIO_DEVICE_ATTR(meas_conf,
hmc5843_set_measurement_configuration,
0);
-static ssize_t hmc5843_show_samp_freq_avail(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t hmc5843_show_int_plus_micros(char *buf,
+ const int (*vals)[2], int n)
{
- struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev));
- ssize_t total_n = 0;
+ ssize_t total_out = 0;
int i;
- for (i = 0; i < HMC5843_RATE_NOT_USED; i++) {
- ssize_t n = sprintf(buf, "%d.%d ",
- data->variant->regval_to_samp_freq[i][0],
- data->variant->regval_to_samp_freq[i][1]);
- buf += n;
- total_n += n;
+ for (i = 0; i < n; i++) {
+ ssize_t out = sprintf(buf, "%d.%d ", vals[i][0], vals[i][1]);
+ buf += out;
+ total_out += out;
}
/* replace trailing space by newline */
buf[-1] = '\n';
- return total_n;
+ return total_out;
+}
+
+static int hmc5843_check_int_plus_micros(const int (*vals)[2], int n,
+ int val, int val2)
+{
+ int i;
+
+ for (i = 0; i < n; i++) {
+ if (val == vals[i][0] && val2 == vals[i][1])
+ return i;
+ }
+
+ return -EINVAL;
+}
+
+static ssize_t hmc5843_show_samp_freq_avail(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev));
+
+ return hmc5843_show_int_plus_micros(buf,
+ data->variant->regval_to_samp_freq, HMC5843_RATE_NOT_USED);
}
static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(hmc5843_show_samp_freq_avail);
@@ -389,15 +408,9 @@ static s32 hmc5843_set_rate(struct hmc5843_data *data, u8 rate)
static int hmc5843_check_samp_freq(struct hmc5843_data *data,
int val, int val2)
{
- int i;
-
- for (i = 0; i < HMC5843_RATE_NOT_USED; i++) {
- if (val == data->variant->regval_to_samp_freq[i][0] &&
- val2 == data->variant->regval_to_samp_freq[i][1])
- return i;
- }
-
- return -EINVAL;
+ return hmc5843_check_int_plus_micros(
+ data->variant->regval_to_samp_freq, HMC5843_RATE_NOT_USED,
+ val, val2);
}
static ssize_t hmc5843_show_range_gain(struct device *dev,
--
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 ` Peter Meerwald [this message]
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 ` [PATCH 15/18] staging:iio:hmc5843: Reorganize _set_meas_conf() Peter Meerwald
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-9-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).