* [PATCH 02/11] staging:iio:adt7310: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 03/11] staging:iio:dummy driver: " Lars-Peter Clausen
` (9 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/adt7310.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c
index e5f1ed7..e05bc30d 100644
--- a/drivers/staging/iio/adc/adt7310.c
+++ b/drivers/staging/iio/adc/adt7310.c
@@ -397,7 +397,7 @@ static irqreturn_t adt7310_event_handler(int irq, void *private)
ret = adt7310_spi_read_byte(chip, ADT7310_STATUS, &status);
if (ret)
- return ret;
+ goto done;
if (status & ADT7310_STAT_T_HIGH)
iio_push_event(indio_dev,
@@ -417,6 +417,8 @@ static irqreturn_t adt7310_event_handler(int irq, void *private)
IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING),
timestamp);
+
+done:
return IRQ_HANDLED;
}
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] staging:iio:dummy driver: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 02/11] staging:iio:adt7310: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 04/11] staging:iio:ad799x: " Lars-Peter Clausen
` (8 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/iio_simple_dummy_buffer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index b9e6093..c0951f9 100644
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -52,7 +52,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL)
- return -ENOMEM;
+ goto done;
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)) {
/*
@@ -91,6 +91,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
kfree(data);
+done:
/*
* Tell the core we are done with this trigger and ready for the
* next one.
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] staging:iio:ad799x: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 02/11] staging:iio:adt7310: " Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 03/11] staging:iio:dummy driver: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 05/11] staging:iio:ad7476: " Lars-Peter Clausen
` (7 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/ad799x_core.c | 5 +++--
drivers/staging/iio/adc/ad799x_ring.c | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 2d4bda9..9900507 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -350,10 +350,10 @@ static irqreturn_t ad799x_event_handler(int irq, void *private)
ret = ad799x_i2c_read8(st, AD7998_ALERT_STAT_REG, &status);
if (ret)
- return ret;
+ goto done;
if (!status)
- return -EIO;
+ goto done;
ad799x_i2c_write8(st, AD7998_ALERT_STAT_REG, AD7998_ALERT_STAT_CLEAR);
@@ -372,6 +372,7 @@ static irqreturn_t ad799x_event_handler(int irq, void *private)
iio_get_time_ns());
}
+done:
return IRQ_HANDLED;
}
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index 0882c9e..858a685 100644
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -81,8 +81,6 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
done:
kfree(rxbuf);
- if (b_sent < 0)
- return b_sent;
out:
iio_trigger_notify_done(indio_dev->trig);
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/11] staging:iio:ad7476: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (2 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 04/11] staging:iio:ad799x: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 06/11] staging:iio:ad7887: " Lars-Peter Clausen
` (6 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/ad7476_ring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index 10f8b8d..d087b21 100644
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -31,7 +31,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p)
rxbuf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (rxbuf == NULL)
- return -ENOMEM;
+ goto done;
b_sent = spi_read(st->spi, rxbuf,
st->chip_info->channel[0].scan_type.storagebits / 8);
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] staging:iio:ad7887: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (3 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 05/11] staging:iio:ad7476: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 07/11] staging:iio:max1363: " Lars-Peter Clausen
` (5 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/ad7887_ring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index 1c406da..c76fdb5 100644
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -82,7 +82,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
buf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (buf == NULL)
- return -ENOMEM;
+ goto done;
b_sent = spi_sync(st->spi, st->ring_msg);
if (b_sent)
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] staging:iio:max1363: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (4 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 06/11] staging:iio:ad7887: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-09 21:36 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 08/11] staging:iio:lis3l02dq: " Lars-Peter Clausen
` (4 subsequent siblings)
10 siblings, 1 reply; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/max1363_ring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index b302013..bf6b0c2 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -64,11 +64,11 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
* no harm.
*/
if (numvals == 0)
- return IRQ_HANDLED;
+ goto done;
rxbuf = kmalloc(d_size, GFP_KERNEL);
if (rxbuf == NULL)
- return -ENOMEM;
+ goto done;
if (st->chip_info->bits != 8)
b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
else
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 07/11] staging:iio:max1363: Do not return error code in interrupt handler
2012-07-04 16:09 ` [PATCH 07/11] staging:iio:max1363: " Lars-Peter Clausen
@ 2012-07-09 21:36 ` Lars-Peter Clausen
0 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-09 21:36 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Jonathan Cameron, linux-iio
On 07/04/2012 06:09 PM, Lars-Peter Clausen wrote:
> The interrupt handler should only ever return one of the three irqreturn_t
> constants and not an error code. Also make sure to always call
> iio_trigger_notify_done before leaving the trigger handler.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Hm, looks like something went wrong here, I actually do have a different
patch in my local tree, this one will introduce a build warning...
> ---
> drivers/staging/iio/adc/max1363_ring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
> index b302013..bf6b0c2 100644
> --- a/drivers/staging/iio/adc/max1363_ring.c
> +++ b/drivers/staging/iio/adc/max1363_ring.c
> @@ -64,11 +64,11 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
> * no harm.
> */
> if (numvals == 0)
> - return IRQ_HANDLED;
> + goto done;
>
> rxbuf = kmalloc(d_size, GFP_KERNEL);
> if (rxbuf == NULL)
> - return -ENOMEM;
> + goto done;
> if (st->chip_info->bits != 8)
> b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
> else
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 08/11] staging:iio:lis3l02dq: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (5 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 07/11] staging:iio:max1363: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 09/11] staging:iio:accel:adis16xxx: Do not return error code in the " Lars-Peter Clausen
` (3 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/accel/lis3l02dq_ring.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 51b00df..d7f8af7 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -143,7 +143,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
if (data == NULL) {
dev_err(indio_dev->dev.parent,
"memory alloc failed in buffer bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
@@ -156,8 +156,9 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
= pf->timestamp;
buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] staging:iio:accel:adis16xxx: Do not return error code in the interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (6 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 08/11] staging:iio:lis3l02dq: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 10/11] staging:iio:adis16260: " Lars-Peter Clausen
` (2 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/accel/adis16201_ring.c | 5 +++--
drivers/staging/iio/accel/adis16203_ring.c | 5 +++--
drivers/staging/iio/accel/adis16204_ring.c | 5 +++--
drivers/staging/iio/accel/adis16209_ring.c | 5 +++--
drivers/staging/iio/accel/adis16240_ring.c | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 247602a..03fcf6e 100644
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -70,7 +70,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)
@@ -85,8 +85,9 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index 7bbd2c2..c16b2b7 100644
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -69,7 +69,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -86,8 +86,9 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
(u8 *)data,
pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index f73518b..1d2b31c 100644
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -66,7 +66,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -81,8 +81,9 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 0906075..1a4a55c 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -66,7 +66,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -81,8 +81,9 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index 86a2a47..360dfed 100644
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -64,7 +64,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -79,8 +79,9 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] staging:iio:adis16260: Do not return error code in the interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (7 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 09/11] staging:iio:accel:adis16xxx: Do not return error code in the " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-04 16:09 ` [PATCH 11/11] staging:iio:adis16400: " Lars-Peter Clausen
2012-07-07 15:47 ` [PATCH 01/11] staging:iio:ad7298: Do not return error code in " Jonathan Cameron
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/gyro/adis16260_ring.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index 0fe2d9d..eeee8e7 100644
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -69,7 +69,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
@@ -84,8 +84,9 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
- iio_trigger_notify_done(indio_dev->trig);
kfree(data);
+done:
+ iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
}
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] staging:iio:adis16400: Do not return error code in the interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (8 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 10/11] staging:iio:adis16260: " Lars-Peter Clausen
@ 2012-07-04 16:09 ` Lars-Peter Clausen
2012-07-07 15:47 ` [PATCH 01/11] staging:iio:ad7298: Do not return error code in " Jonathan Cameron
10 siblings, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2012-07-04 16:09 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
The interrupt handler should only ever return one of the three irqreturn_t
constants and not an error code. Also make sure to always call
iio_trigger_notify_done before leaving the trigger handler.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/imu/adis16400_ring.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 809e2c4..beec650 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -125,20 +125,20 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (data == NULL) {
dev_err(&st->us->dev, "memory alloc failed in ring bh");
- return -ENOMEM;
+ goto done;
}
if (scan_count) {
if (st->variant->flags & ADIS16400_NO_BURST) {
ret = adis16350_spi_read_all(indio_dev, st->rx);
if (ret < 0)
- goto err;
+ goto done;
for (; i < scan_count; i++)
data[i] = *(s16 *)(st->rx + i*2);
} else {
ret = adis16400_spi_read_burst(indio_dev, st->rx);
if (ret < 0)
- goto err;
+ goto done;
for (; i < scan_count; i++) {
j = __ffs(mask);
mask &= ~(1 << j);
@@ -152,14 +152,11 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
+done:
+ kfree(data);
iio_trigger_notify_done(indio_dev->trig);
- kfree(data);
return IRQ_HANDLED;
-
-err:
- kfree(data);
- return ret;
}
void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
--
1.7.10
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler
2012-07-04 16:09 [PATCH 01/11] staging:iio:ad7298: Do not return error code in interrupt handler Lars-Peter Clausen
` (9 preceding siblings ...)
2012-07-04 16:09 ` [PATCH 11/11] staging:iio:adis16400: " Lars-Peter Clausen
@ 2012-07-07 15:47 ` Jonathan Cameron
10 siblings, 0 replies; 13+ messages in thread
From: Jonathan Cameron @ 2012-07-07 15:47 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Jonathan Cameron, linux-iio
On 07/04/2012 05:09 PM, Lars-Peter Clausen wrote:
> The interrupt handler should only ever return one of the three irqreturn_t
> constants and not an error code. Also make sure to always call
> iio_trigger_notify_done before leaving the trigger handler.
>
merged all. Thanks.
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> drivers/staging/iio/adc/ad7298_ring.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
> index cd3e9cb..fd1d855 100644
> --- a/drivers/staging/iio/adc/ad7298_ring.c
> +++ b/drivers/staging/iio/adc/ad7298_ring.c
> @@ -82,7 +82,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
>
> b_sent = spi_sync(st->spi, &st->ring_msg);
> if (b_sent)
> - return b_sent;
> + goto done;
>
> if (indio_dev->scan_timestamp) {
> time_ns = iio_get_time_ns();
> @@ -95,6 +95,8 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
> buf[i] = be16_to_cpu(st->rx_buf[i]);
>
> indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
> +
> +done:
> iio_trigger_notify_done(indio_dev->trig);
>
> return IRQ_HANDLED;
>
^ permalink raw reply [flat|nested] 13+ messages in thread