diff options
| author | Lars-Peter Clausen | 2012-04-25 09:44:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-04-25 19:57:19 +0200 |
| commit | 5ff6a99d7c6c804c3b58608e8a476f4d7fd2dfd8 (patch) | |
| tree | 6de361879cb274dc30283aa8ce612dce8af55d55 | |
| parent | staging:iio:dac:ad5446: Do not exit powerdown when writing a sample (diff) | |
| download | kernel-qcow2-linux-5ff6a99d7c6c804c3b58608e8a476f4d7fd2dfd8.tar.gz kernel-qcow2-linux-5ff6a99d7c6c804c3b58608e8a476f4d7fd2dfd8.tar.xz kernel-qcow2-linux-5ff6a99d7c6c804c3b58608e8a476f4d7fd2dfd8.zip | |
staging:iio:dac:ad5446: Remove duplicated write sample functions
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>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/iio/dac/ad5446.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c index de796c2f0b22..0da5c6cdfcca 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,61 +164,61 @@ 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_AD5542A] = { .channel = AD5446_CHANNEL(16, 16, 0), - .store_sample = ad5542_store_sample, + .store_sample = ad5446_store_sample, }, [ID_AD5543] = { .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] = { |