mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
rtc: rtc-max8997: 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>
This commit is contained in:
parent
83a72c87e9
commit
c1879fe80c
1 changed files with 3 additions and 4 deletions
|
@ -495,7 +495,8 @@ static int max8997_rtc_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
info->virq = virq;
|
info->virq = virq;
|
||||||
|
|
||||||
ret = request_threaded_irq(virq, NULL, max8997_rtc_alarm_irq, 0,
|
ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
|
||||||
|
max8997_rtc_alarm_irq, 0,
|
||||||
"rtc-alarm0", info);
|
"rtc-alarm0", info);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
|
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
|
||||||
|
@ -514,10 +515,8 @@ static int max8997_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct max8997_rtc_info *info = platform_get_drvdata(pdev);
|
struct max8997_rtc_info *info = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
if (info) {
|
if (info)
|
||||||
free_irq(info->virq, info);
|
|
||||||
rtc_device_unregister(info->rtc_dev);
|
rtc_device_unregister(info->rtc_dev);
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue