Skip to content

Commit

Permalink
staging:iio:ad799x Move to devm_request_threaded_irq to make device-r…
Browse files Browse the repository at this point in the history
…emoval simpler.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Hartmut Knaack authored and Jonathan Cameron committed Feb 15, 2014
1 parent a37d70e commit cc7c0f7
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions drivers/staging/iio/adc/ad799x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -577,25 +577,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:
Expand All @@ -611,8 +609,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))
Expand Down

0 comments on commit cc7c0f7

Please sign in to comment.