diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2013-12-23 17:48:00 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-01-01 14:31:56 +0000 |
| commit | 38125b2c935b0037787ca213f96a7b976eba3199 (patch) | |
| tree | 91d0e44e1e391df097edf1dd3173d44e6a5f36c1 | |
| parent | aba70f2a583d31a9cface717886378c9592447d9 (diff) | |
iio: mxs-lradc: convert is_divided to a bitmapiio-for-3.14c
mxs_lradc.is_divided was an unsigned long array. Convert it to a bitmap to save
some memory.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index a58c6aaa94d3..df71669bb60e 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -211,7 +211,7 @@ struct mxs_lradc { const uint32_t *vref_mv; struct mxs_lradc_scale scale_avail[LRADC_MAX_TOTAL_CHANS][2]; - unsigned int is_divided[LRADC_MAX_TOTAL_CHANS]; + unsigned long is_divided; /* * Touchscreen LRADC channels receives a private slot in the CTRL4 @@ -920,7 +920,7 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev, *val = lradc->vref_mv[chan->channel]; *val2 = chan->scan_type.realbits - - lradc->is_divided[chan->channel]; + test_bit(chan->channel, &lradc->is_divided); return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_OFFSET: @@ -965,14 +965,14 @@ static int mxs_lradc_write_raw(struct iio_dev *iio_dev, /* divider by two disabled */ writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_CLR); - lradc->is_divided[chan->channel] = 0; + clear_bit(chan->channel, &lradc->is_divided); ret = 0; } else if (val == scale_avail[MXS_LRADC_DIV_ENABLED].integer && val2 == scale_avail[MXS_LRADC_DIV_ENABLED].nano) { /* divider by two enabled */ writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_SET); - lradc->is_divided[chan->channel] = 1; + set_bit(chan->channel, &lradc->is_divided); ret = 0; } |