diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-02-21 19:45:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:22:30 -0500 |
commit | 83a72c87e9d52820e9d3058004874af4df377a4d (patch) | |
tree | da2e25c50fa5cff41447b442654d513bfde1abd4 /drivers/rtc/rtc-max8907.c | |
parent | 27239a1498f85c16306fdc614658d0bc1ee685ef (diff) |
rtc: rtc-max8907: use devm_request_threaded_irq()
Use devm_request_threaded_irq() to make cleanup paths more simple.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-max8907.c')
-rw-r--r-- | drivers/rtc/rtc-max8907.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c index 1d049da16c85..31ca8faf9f05 100644 --- a/drivers/rtc/rtc-max8907.c +++ b/drivers/rtc/rtc-max8907.c | |||
@@ -205,8 +205,9 @@ static int max8907_rtc_probe(struct platform_device *pdev) | |||
205 | goto err_unregister; | 205 | goto err_unregister; |
206 | } | 206 | } |
207 | 207 | ||
208 | ret = request_threaded_irq(rtc->irq, NULL, max8907_irq_handler, | 208 | ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL, |
209 | IRQF_ONESHOT, "max8907-alarm0", rtc); | 209 | max8907_irq_handler, |
210 | IRQF_ONESHOT, "max8907-alarm0", rtc); | ||
210 | if (ret < 0) { | 211 | if (ret < 0) { |
211 | dev_err(&pdev->dev, "Failed to request IRQ%d: %d\n", | 212 | dev_err(&pdev->dev, "Failed to request IRQ%d: %d\n", |
212 | rtc->irq, ret); | 213 | rtc->irq, ret); |
@@ -224,7 +225,6 @@ static int max8907_rtc_remove(struct platform_device *pdev) | |||
224 | { | 225 | { |
225 | struct max8907_rtc *rtc = platform_get_drvdata(pdev); | 226 | struct max8907_rtc *rtc = platform_get_drvdata(pdev); |
226 | 227 | ||
227 | free_irq(rtc->irq, rtc); | ||
228 | rtc_device_unregister(rtc->rtc_dev); | 228 | rtc_device_unregister(rtc->rtc_dev); |
229 | 229 | ||
230 | return 0; | 230 | return 0; |