From eec06b8c532588fb114fcbd9724f3c9fbdfe10c9 Mon Sep 17 00:00:00 2001 From: Varka Bhadram Date: Thu, 22 Jan 2015 09:08:03 +0530 Subject: imu: inv_mpu6050: use devm_request_irq This patch use the devres API for requesting an IRQ. Signed-off-by: Varka Bhadram Signed-off-by: Jonathan Cameron --- drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'drivers') diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c index c827d21f7381..ab8c85a2a5f8 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c @@ -124,10 +124,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev) ret = -ENOMEM; goto error_ret; } - ret = request_irq(st->client->irq, &iio_trigger_generic_data_rdy_poll, - IRQF_TRIGGER_RISING, - "inv_mpu", - st->trig); + ret = devm_request_irq(&indio_dev->dev, st->client->irq, + &iio_trigger_generic_data_rdy_poll, + IRQF_TRIGGER_RISING, + "inv_mpu", + st->trig); if (ret) goto error_ret; st->trig->dev.parent = &st->client->dev; @@ -135,13 +136,11 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev) iio_trigger_set_drvdata(st->trig, indio_dev); ret = iio_trigger_register(st->trig); if (ret) - goto error_free_irq; + goto error_ret; indio_dev->trig = iio_trigger_get(st->trig); return 0; -error_free_irq: - free_irq(st->client->irq, st->trig); error_ret: return ret; } @@ -149,5 +148,4 @@ error_ret: void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st) { iio_trigger_unregister(st->trig); - free_irq(st->client->irq, st->trig); } -- cgit v1.2.3-59-g8ed1b