From: Lars-Peter Clausen <lars@metafoo.de>
To: Jonathan Cameron <jic23@cam.ac.uk>
Cc: linux-iio@vger.kernel.org,
device-drivers-devel@blackfin.uclinux.org, drivers@analog.com,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 5/8] staging:iio:dac:ad5446: Remove duplicated write sample functions
Date: Mon, 23 Apr 2012 19:51:34 +0200 [thread overview]
Message-ID: <1335203497-11041-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1335203497-11041-1-git-send-email-lars@metafoo.de>
AD5620_LOAD and AD5446_LOAD are both 0, so all these three functions are
identical and we can replace them with only one.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/dac/ad5446.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c
index 693485a..6b8f341 100644
--- a/drivers/staging/iio/dac/ad5446.c
+++ b/drivers/staging/iio/dac/ad5446.c
@@ -26,19 +26,9 @@
static void ad5446_store_sample(struct ad5446_state *st, unsigned val)
{
- st->data.d16 = cpu_to_be16(AD5446_LOAD | val);
-}
-
-static void ad5542_store_sample(struct ad5446_state *st, unsigned val)
-{
st->data.d16 = cpu_to_be16(val);
}
-static void ad5620_store_sample(struct ad5446_state *st, unsigned val)
-{
- st->data.d16 = cpu_to_be16(AD5620_LOAD | val);
-}
-
static void ad5660_store_sample(struct ad5446_state *st, unsigned val)
{
val |= AD5660_LOAD;
@@ -174,53 +164,53 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
},
[ID_AD5541A] = {
.channel = AD5446_CHANNEL(16, 16, 0),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
},
[ID_AD5512A] = {
.channel = AD5446_CHANNEL(12, 16, 4),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
},
[ID_AD5553] = {
.channel = AD5446_CHANNEL(14, 16, 0),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
},
[ID_AD5601] = {
.channel = AD5446_CHANNEL(8, 16, 6),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5611] = {
.channel = AD5446_CHANNEL(10, 16, 4),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5621] = {
.channel = AD5446_CHANNEL(12, 16, 2),
- .store_sample = ad5542_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5620_2500] = {
.channel = AD5446_CHANNEL(12, 16, 2),
.int_vref_mv = 2500,
- .store_sample = ad5620_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5620_1250] = {
.channel = AD5446_CHANNEL(12, 16, 2),
.int_vref_mv = 1250,
- .store_sample = ad5620_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5640_2500] = {
.channel = AD5446_CHANNEL(14, 16, 0),
.int_vref_mv = 2500,
- .store_sample = ad5620_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5640_1250] = {
.channel = AD5446_CHANNEL(14, 16, 0),
.int_vref_mv = 1250,
- .store_sample = ad5620_store_sample,
+ .store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
},
[ID_AD5660_2500] = {
--
1.7.9.5
next prev parent reply other threads:[~2012-04-23 17:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 17:51 [PATCH 1/8] staging:iio:dac:ad5446: Do not exit powerdown when writing a sample Lars-Peter Clausen
2012-04-23 17:51 ` [PATCH 2/8] staging:iio:dac:ad5446: Remove unused struct field Lars-Peter Clausen
2012-04-23 20:41 ` Jonathan Cameron
2012-04-23 17:51 ` [PATCH 3/8] staging:iio:dac:ad5446: Do not check for individual chip ids in probe Lars-Peter Clausen
2012-04-23 20:43 ` Jonathan Cameron
2012-04-23 17:51 ` [PATCH 4/8] staging:iio:dac:ad5446: Remove duplicated chip_info entries Lars-Peter Clausen
2012-04-23 20:44 ` Jonathan Cameron
2012-04-23 17:51 ` Lars-Peter Clausen [this message]
2012-04-23 21:15 ` [PATCH 5/8] staging:iio:dac:ad5446: Remove duplicated write sample functions Jonathan Cameron
2012-04-23 17:51 ` [PATCH 6/8] staging:iio:dac:ad5446: Convert to extended channel attributes Lars-Peter Clausen
2012-04-23 21:25 ` Jonathan Cameron
2012-04-23 17:51 ` [PATCH 7/8] staging:iio:dac:ad5446: Consolidate store_sample and store_pwr_down functions Lars-Peter Clausen
2012-04-24 8:06 ` Jonathan Cameron
2012-04-24 9:11 ` Lars-Peter Clausen
2012-04-24 9:10 ` Jonathan Cameron
2012-04-23 17:51 ` [PATCH 8/8] staging:iio:dac:ad5446: Add support for the AD5662 Lars-Peter Clausen
2012-04-24 8:10 ` Jonathan Cameron
2012-04-23 20:40 ` [PATCH 1/8] staging:iio:dac:ad5446: Do not exit powerdown when writing a sample 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=1335203497-11041-5-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=jic23@cam.ac.uk \
--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).