* [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers
2013-05-04 13:19 [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Michał Mirosław
@ 2013-05-04 13:19 ` Michał Mirosław
2013-05-06 16:30 ` Jonathan Cameron
2013-05-06 16:27 ` [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: Michał Mirosław @ 2013-05-04 13:19 UTC (permalink / raw)
To: linux-arm-kernel
This fixes 'preenable failed: -EINVAL' error when using this driver.
Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl>
---
drivers/staging/iio/adc/mxs-lradc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index 03299ea..d92c97a 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -690,7 +690,6 @@ static void mxs_lradc_trigger_remove(struct iio_dev *iio)
static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
{
struct mxs_lradc *lradc = iio_priv(iio);
- struct iio_buffer *buffer = iio->buffer;
int ret = 0, chan, ofs = 0;
unsigned long enable = 0;
uint32_t ctrl4_set = 0;
@@ -698,7 +697,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
uint32_t ctrl1_irq = 0;
const uint32_t chan_value = LRADC_CH_ACCUMULATE |
((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
- const int len = bitmap_weight(buffer->scan_mask, LRADC_MAX_TOTAL_CHANS);
+ const int len = bitmap_weight(iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS);
if (!len)
return -EINVAL;
@@ -725,7 +724,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR);
writel(0xff, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_CLR);
- for_each_set_bit(chan, buffer->scan_mask, LRADC_MAX_TOTAL_CHANS) {
+ for_each_set_bit(chan, iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS) {
ctrl4_set |= chan << LRADC_CTRL4_LRADCSELECT_OFFSET(ofs);
ctrl4_clr |= LRADC_CTRL4_LRADCSELECT_MASK(ofs);
ctrl1_irq |= LRADC_CTRL1_LRADC_IRQ_EN(ofs);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength
@ 2013-05-04 13:19 Michał Mirosław
2013-05-04 13:19 ` [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers Michał Mirosław
2013-05-06 16:27 ` [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Jonathan Cameron
0 siblings, 2 replies; 4+ messages in thread
From: Michał Mirosław @ 2013-05-04 13:19 UTC (permalink / raw)
To: linux-arm-kernel
We know the exact iio->masklength = LRADC_MAX_TOTAL_CHANS.
Let's use it consistently.
Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl>
---
drivers/staging/iio/adc/mxs-lradc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index 2856b8f..03299ea 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -620,7 +620,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
unsigned int i, j = 0;
- for_each_set_bit(i, iio->active_scan_mask, iio->masklength) {
+ for_each_set_bit(i, iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS) {
lradc->buffer[j] = readl(lradc->base + LRADC_CH(j));
writel(chan_value, lradc->base + LRADC_CH(j));
lradc->buffer[j] &= LRADC_CH_VALUE_MASK;
@@ -775,8 +775,7 @@ static bool mxs_lradc_validate_scan_mask(struct iio_dev *iio,
const unsigned long *mask)
{
struct mxs_lradc *lradc = iio_priv(iio);
- const int len = iio->masklength;
- const int map_chans = bitmap_weight(mask, len);
+ const int map_chans = bitmap_weight(mask, LRADC_MAX_TOTAL_CHANS);
int rsvd_chans = 0;
unsigned long rsvd_mask = 0;
@@ -793,7 +792,7 @@ static bool mxs_lradc_validate_scan_mask(struct iio_dev *iio,
rsvd_chans++;
/* Test for attempts to map channels with special mode of operation. */
- if (bitmap_intersects(mask, &rsvd_mask, len))
+ if (bitmap_intersects(mask, &rsvd_mask, LRADC_MAX_TOTAL_CHANS))
return false;
/* Test for attempts to map more channels then available slots. */
@@ -969,6 +968,7 @@ static int mxs_lradc_probe(struct platform_device *pdev)
iio->modes = INDIO_DIRECT_MODE;
iio->channels = mxs_lradc_chan_spec;
iio->num_channels = ARRAY_SIZE(mxs_lradc_chan_spec);
+ iio->masklength = LRADC_MAX_TOTAL_CHANS;
ret = iio_triggered_buffer_setup(iio, &iio_pollfunc_store_time,
&mxs_lradc_trigger_handler,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength
2013-05-04 13:19 [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Michał Mirosław
2013-05-04 13:19 ` [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers Michał Mirosław
@ 2013-05-06 16:27 ` Jonathan Cameron
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2013-05-06 16:27 UTC (permalink / raw)
To: linux-arm-kernel
On 05/04/2013 02:19 PM, Micha? Miros?aw wrote:
> We know the exact iio->masklength = LRADC_MAX_TOTAL_CHANS.
> Let's use it consistently.
I guess this gives a small improvement in clarity so
applied to togreg branch of iio.git.
Thanks,
>
> Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl>
> ---
> drivers/staging/iio/adc/mxs-lradc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
> index 2856b8f..03299ea 100644
> --- a/drivers/staging/iio/adc/mxs-lradc.c
> +++ b/drivers/staging/iio/adc/mxs-lradc.c
> @@ -620,7 +620,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
> ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
> unsigned int i, j = 0;
>
> - for_each_set_bit(i, iio->active_scan_mask, iio->masklength) {
> + for_each_set_bit(i, iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS) {
> lradc->buffer[j] = readl(lradc->base + LRADC_CH(j));
> writel(chan_value, lradc->base + LRADC_CH(j));
> lradc->buffer[j] &= LRADC_CH_VALUE_MASK;
> @@ -775,8 +775,7 @@ static bool mxs_lradc_validate_scan_mask(struct iio_dev *iio,
> const unsigned long *mask)
> {
> struct mxs_lradc *lradc = iio_priv(iio);
> - const int len = iio->masklength;
> - const int map_chans = bitmap_weight(mask, len);
> + const int map_chans = bitmap_weight(mask, LRADC_MAX_TOTAL_CHANS);
> int rsvd_chans = 0;
> unsigned long rsvd_mask = 0;
>
> @@ -793,7 +792,7 @@ static bool mxs_lradc_validate_scan_mask(struct iio_dev *iio,
> rsvd_chans++;
>
> /* Test for attempts to map channels with special mode of operation. */
> - if (bitmap_intersects(mask, &rsvd_mask, len))
> + if (bitmap_intersects(mask, &rsvd_mask, LRADC_MAX_TOTAL_CHANS))
> return false;
>
> /* Test for attempts to map more channels then available slots. */
> @@ -969,6 +968,7 @@ static int mxs_lradc_probe(struct platform_device *pdev)
> iio->modes = INDIO_DIRECT_MODE;
> iio->channels = mxs_lradc_chan_spec;
> iio->num_channels = ARRAY_SIZE(mxs_lradc_chan_spec);
> + iio->masklength = LRADC_MAX_TOTAL_CHANS;
>
> ret = iio_triggered_buffer_setup(iio, &iio_pollfunc_store_time,
> &mxs_lradc_trigger_handler,
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers
2013-05-04 13:19 ` [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers Michał Mirosław
@ 2013-05-06 16:30 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2013-05-06 16:30 UTC (permalink / raw)
To: linux-arm-kernel
On 05/04/2013 02:19 PM, Micha? Miros?aw wrote:
> This fixes 'preenable failed: -EINVAL' error when using this driver.
>
For future patches, please cleanly separate out (in a different series)
the bug fixes from the cleanups. This one has been applied to the
fixes-togreg branch of iio.git wherease the first patch will go
through the togreg branch and hit one kernel cycle later.
Applied to the fixes-togreg
> Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl>
> ---
> drivers/staging/iio/adc/mxs-lradc.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
> index 03299ea..d92c97a 100644
> --- a/drivers/staging/iio/adc/mxs-lradc.c
> +++ b/drivers/staging/iio/adc/mxs-lradc.c
> @@ -690,7 +690,6 @@ static void mxs_lradc_trigger_remove(struct iio_dev *iio)
> static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
> {
> struct mxs_lradc *lradc = iio_priv(iio);
> - struct iio_buffer *buffer = iio->buffer;
> int ret = 0, chan, ofs = 0;
> unsigned long enable = 0;
> uint32_t ctrl4_set = 0;
> @@ -698,7 +697,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
> uint32_t ctrl1_irq = 0;
> const uint32_t chan_value = LRADC_CH_ACCUMULATE |
> ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
> - const int len = bitmap_weight(buffer->scan_mask, LRADC_MAX_TOTAL_CHANS);
> + const int len = bitmap_weight(iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS);
>
> if (!len)
> return -EINVAL;
> @@ -725,7 +724,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
> lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR);
> writel(0xff, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_CLR);
>
> - for_each_set_bit(chan, buffer->scan_mask, LRADC_MAX_TOTAL_CHANS) {
> + for_each_set_bit(chan, iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS) {
> ctrl4_set |= chan << LRADC_CTRL4_LRADCSELECT_OFFSET(ofs);
> ctrl4_clr |= LRADC_CTRL4_LRADCSELECT_MASK(ofs);
> ctrl1_irq |= LRADC_CTRL1_LRADC_IRQ_EN(ofs);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-06 16:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-04 13:19 [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Michał Mirosław
2013-05-04 13:19 ` [PATCH 2/2] staging/iio/mxs-lradc: fix preenable for multiple buffers Michał Mirosław
2013-05-06 16:30 ` Jonathan Cameron
2013-05-06 16:27 ` [PATCH 1/2] staging/iio/mxs-lradc: cleanup masklength Jonathan Cameron
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).