rtc: rtc-max8997: use devm_request_threaded_irq()

Jingoo Han · torvalds · commit c1879fe80c61 · 2013-02-21T17:22:30.000-08:00
Use devm_request_threaded_irq() to make cleanup paths more simple.

Signed-off-by: Jingoo Han &lt;jg1.han@samsung.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
@@ -495,7 +495,8 @@ static int max8997_rtc_probe(struct platform_device *pdev)
 	}
 	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);
 	if (ret < 0) {
 		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);
 
-	if (info) {
-		free_irq(info->virq, info);
+	if (info)
 		rtc_device_unregister(info->rtc_dev);
-	}
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,8 @@ static int max8997_rtc_probe(struct platform_device *pdev)`
`495`	`495`	`}`
`496`	`496`	`info->virq = virq;`
`497`	`497`
`498`		`- ret = request_threaded_irq(virq, NULL, max8997_rtc_alarm_irq, 0,`
	`498`	`+ ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,`
	`499`	`+ max8997_rtc_alarm_irq, 0,`
`499`	`500`	`"rtc-alarm0", info);`
`500`	`501`	`if (ret < 0) {`
`501`	`502`	`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)`
`514`	`515`	`{`
`515`	`516`	`struct max8997_rtc_info *info = platform_get_drvdata(pdev);`
`516`	`517`
`517`		`- if (info) {`
`518`		`- free_irq(info->virq, info);`
	`518`	`+ if (info)`
`519`	`519`	`rtc_device_unregister(info->rtc_dev);`
`520`		`- }`
`521`	`520`
`522`	`521`	`return 0;`
`523`	`522`	`}`