* [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq
@ 2014-01-01 23:04 Hartmut Knaack
2014-01-05 16:05 ` Lars-Peter Clausen
2014-02-15 9:53 ` Jonathan Cameron
0 siblings, 2 replies; 4+ messages in thread
From: Hartmut Knaack @ 2014-01-01 23:04 UTC (permalink / raw)
To: linux-iio
Move to devm_request_threaded_irq to make device-removal easier.
Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
---
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 3deb390..bc886f6 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -573,25 +573,23 @@ static int ad799x_probe(struct i2c_client *client,
goto error_disable_reg;
if (client->irq > 0) {
- ret = request_threaded_irq(client->irq,
- NULL,
- ad799x_event_handler,
- IRQF_TRIGGER_FALLING |
- IRQF_ONESHOT,
- client->name,
- indio_dev);
+ ret = devm_request_threaded_irq(&client->dev,
+ client->irq,
+ NULL,
+ ad799x_event_handler,
+ IRQF_TRIGGER_FALLING |
+ IRQF_ONESHOT,
+ client->name,
+ indio_dev);
if (ret)
goto error_cleanup_ring;
}
ret = iio_device_register(indio_dev);
if (ret)
- goto error_free_irq;
+ goto error_cleanup_ring;
return 0;
-error_free_irq:
- if (client->irq > 0)
- free_irq(client->irq, indio_dev);
error_cleanup_ring:
ad799x_ring_cleanup(indio_dev);
error_disable_reg:
@@ -607,8 +605,6 @@ static int ad799x_remove(struct i2c_client *client)
struct ad799x_state *st = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
- if (client->irq > 0)
- free_irq(client->irq, indio_dev);
ad799x_ring_cleanup(indio_dev);
if (!IS_ERR(st->reg))
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq
2014-01-01 23:04 [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq Hartmut Knaack
@ 2014-01-05 16:05 ` Lars-Peter Clausen
2014-01-11 11:50 ` Jonathan Cameron
2014-02-15 9:53 ` Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: Lars-Peter Clausen @ 2014-01-05 16:05 UTC (permalink / raw)
To: Hartmut Knaack; +Cc: linux-iio
On 01/02/2014 12:04 AM, Hartmut Knaack wrote:
> Move to devm_request_threaded_irq to make device-removal easier.
>
> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
I'm not a fan of devm_request_threaded_irq() since it makes it easy to get
things wrong. But well.
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
> index 3deb390..bc886f6 100644
> --- a/drivers/staging/iio/adc/ad799x_core.c
> +++ b/drivers/staging/iio/adc/ad799x_core.c
> @@ -573,25 +573,23 @@ static int ad799x_probe(struct i2c_client *client,
> goto error_disable_reg;
>
> if (client->irq > 0) {
> - ret = request_threaded_irq(client->irq,
> - NULL,
> - ad799x_event_handler,
> - IRQF_TRIGGER_FALLING |
> - IRQF_ONESHOT,
> - client->name,
> - indio_dev);
> + ret = devm_request_threaded_irq(&client->dev,
> + client->irq,
> + NULL,
> + ad799x_event_handler,
> + IRQF_TRIGGER_FALLING |
> + IRQF_ONESHOT,
> + client->name,
> + indio_dev);
> if (ret)
> goto error_cleanup_ring;
> }
> ret = iio_device_register(indio_dev);
> if (ret)
> - goto error_free_irq;
> + goto error_cleanup_ring;
>
> return 0;
>
> -error_free_irq:
> - if (client->irq > 0)
> - free_irq(client->irq, indio_dev);
> error_cleanup_ring:
> ad799x_ring_cleanup(indio_dev);
> error_disable_reg:
> @@ -607,8 +605,6 @@ static int ad799x_remove(struct i2c_client *client)
> struct ad799x_state *st = iio_priv(indio_dev);
>
> iio_device_unregister(indio_dev);
> - if (client->irq > 0)
> - free_irq(client->irq, indio_dev);
>
> ad799x_ring_cleanup(indio_dev);
> if (!IS_ERR(st->reg))
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq
2014-01-05 16:05 ` Lars-Peter Clausen
@ 2014-01-11 11:50 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2014-01-11 11:50 UTC (permalink / raw)
To: Lars-Peter Clausen, Hartmut Knaack; +Cc: linux-iio
On 05/01/14 16:05, Lars-Peter Clausen wrote:
> On 01/02/2014 12:04 AM, Hartmut Knaack wrote:
>> Move to devm_request_threaded_irq to make device-removal easier.
>>
>> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
>
> I'm not a fan of devm_request_threaded_irq() since it makes it easy to get
> things wrong. But well.
>
> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
I'll hold this one until patch 1 has made it into staging-next via linus'
tree.
Thanks,
Jonathan
>
>> ---
>> diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
>> index 3deb390..bc886f6 100644
>> --- a/drivers/staging/iio/adc/ad799x_core.c
>> +++ b/drivers/staging/iio/adc/ad799x_core.c
>> @@ -573,25 +573,23 @@ static int ad799x_probe(struct i2c_client *client,
>> goto error_disable_reg;
>>
>> if (client->irq > 0) {
>> - ret = request_threaded_irq(client->irq,
>> - NULL,
>> - ad799x_event_handler,
>> - IRQF_TRIGGER_FALLING |
>> - IRQF_ONESHOT,
>> - client->name,
>> - indio_dev);
>> + ret = devm_request_threaded_irq(&client->dev,
>> + client->irq,
>> + NULL,
>> + ad799x_event_handler,
>> + IRQF_TRIGGER_FALLING |
>> + IRQF_ONESHOT,
>> + client->name,
>> + indio_dev);
>> if (ret)
>> goto error_cleanup_ring;
>> }
>> ret = iio_device_register(indio_dev);
>> if (ret)
>> - goto error_free_irq;
>> + goto error_cleanup_ring;
>>
>> return 0;
>>
>> -error_free_irq:
>> - if (client->irq > 0)
>> - free_irq(client->irq, indio_dev);
>> error_cleanup_ring:
>> ad799x_ring_cleanup(indio_dev);
>> error_disable_reg:
>> @@ -607,8 +605,6 @@ static int ad799x_remove(struct i2c_client *client)
>> struct ad799x_state *st = iio_priv(indio_dev);
>>
>> iio_device_unregister(indio_dev);
>> - if (client->irq > 0)
>> - free_irq(client->irq, indio_dev);
>>
>> ad799x_ring_cleanup(indio_dev);
>> if (!IS_ERR(st->reg))
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq
2014-01-01 23:04 [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq Hartmut Knaack
2014-01-05 16:05 ` Lars-Peter Clausen
@ 2014-02-15 9:53 ` Jonathan Cameron
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2014-02-15 9:53 UTC (permalink / raw)
To: Hartmut Knaack, linux-iio
On 01/01/14 23:04, Hartmut Knaack wrote:
> Move to devm_request_threaded_irq to make device-removal easier.
>
> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Applied to the togreg branch of iio.git
I took the short description above and used it as the patch title as it
was more accurate after the patch split up.
> ---
> diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
> index 3deb390..bc886f6 100644
> --- a/drivers/staging/iio/adc/ad799x_core.c
> +++ b/drivers/staging/iio/adc/ad799x_core.c
> @@ -573,25 +573,23 @@ static int ad799x_probe(struct i2c_client *client,
> goto error_disable_reg;
>
> if (client->irq > 0) {
> - ret = request_threaded_irq(client->irq,
> - NULL,
> - ad799x_event_handler,
> - IRQF_TRIGGER_FALLING |
> - IRQF_ONESHOT,
> - client->name,
> - indio_dev);
> + ret = devm_request_threaded_irq(&client->dev,
> + client->irq,
> + NULL,
> + ad799x_event_handler,
> + IRQF_TRIGGER_FALLING |
> + IRQF_ONESHOT,
> + client->name,
> + indio_dev);
> if (ret)
> goto error_cleanup_ring;
> }
> ret = iio_device_register(indio_dev);
> if (ret)
> - goto error_free_irq;
> + goto error_cleanup_ring;
>
> return 0;
>
> -error_free_irq:
> - if (client->irq > 0)
> - free_irq(client->irq, indio_dev);
> error_cleanup_ring:
> ad799x_ring_cleanup(indio_dev);
> error_disable_reg:
> @@ -607,8 +605,6 @@ static int ad799x_remove(struct i2c_client *client)
> struct ad799x_state *st = iio_priv(indio_dev);
>
> iio_device_unregister(indio_dev);
> - if (client->irq > 0)
> - free_irq(client->irq, indio_dev);
>
> ad799x_ring_cleanup(indio_dev);
> if (!IS_ERR(st->reg))
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-15 9:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-01 23:04 [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq Hartmut Knaack
2014-01-05 16:05 ` Lars-Peter Clausen
2014-01-11 11:50 ` Jonathan Cameron
2014-02-15 9:53 ` 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).