evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging:iio:ad799x Move to devm_request_threaded_irq to make device-removal simpler.

Browse source 
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>
This commit is contained in:
Hartmut Knaack 2014-01-01 23:04:00 +00:00 • committed by Jonathan Cameron
parent a37d70eb65
commit cc7c0f7e07
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/iio/adc/ad799x_core.c
View file

@ -577,25 +577,23 @@ static int ad799x_probe(struct i2c_client *client,
goto error_disable_reg; goto error_disable_reg;
if (client->irq > 0) { if (client->irq > 0) {
ret = request_threaded_irq(client->irq, ret = devm_request_threaded_irq(&client->dev,
NULL, client->irq,
ad799x_event_handler, NULL,
IRQF_TRIGGER_FALLING | ad799x_event_handler,
IRQF_ONESHOT, IRQF_TRIGGER_FALLING |
client->name, IRQF_ONESHOT,
indio_dev); client->name,
indio_dev);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
} }
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_irq; goto error_cleanup_ring;
return 0; return 0;
error_free_irq:
if (client->irq > 0)
free_irq(client->irq, indio_dev);
error_cleanup_ring: error_cleanup_ring:
ad799x_ring_cleanup(indio_dev); ad799x_ring_cleanup(indio_dev);
error_disable_reg: error_disable_reg:
@ -611,8 +609,6 @@ static int ad799x_remove(struct i2c_client *client)
struct ad799x_state *st = iio_priv(indio_dev); struct ad799x_state *st = iio_priv(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (client->irq > 0)
free_irq(client->irq, indio_dev);
ad799x_ring_cleanup(indio_dev); ad799x_ring_cleanup(indio_dev);
if (!IS_ERR(st->reg)) if (!IS_ERR(st->reg))