Skip to contentSkip to conversation

wm8350: Fix section annotations

PATCH In review Mark Brown 2 participants 2 messages Jan 8, 2009

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 wm8350: Fix section annotations

The probe and remove functions were incorrectly annotated, with the misannotation of the remove function causing build failures when built in.

---
 drivers/watchdog/wm8350_wdt.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/watchdog/wm8350_wdt.c +3 -3
index 2bc0d4d..a2d2e8e 100644
@@ -279,7 +279,7 @@ static struct miscdevice wm8350_wdt_miscdev = {
 	.fops = &wm8350_wdt_fops,
 };
 
-static int wm8350_wdt_probe(struct platform_device *pdev)
+static int __devinit wm8350_wdt_probe(struct platform_device *pdev)
 {
 	struct wm8350 *wm8350 = platform_get_drvdata(pdev);
 
@@ -296,7 +296,7 @@ static int wm8350_wdt_probe(struct platform_device *pdev)
 	return misc_register(&wm8350_wdt_miscdev);
 }
 
-static int __exit wm8350_wdt_remove(struct platform_device *pdev)
+static int __devexit wm8350_wdt_remove(struct platform_device *pdev)
 {
 	misc_deregister(&wm8350_wdt_miscdev);
 
@@ -305,7 +305,7 @@ static int __exit wm8350_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver wm8350_wdt_driver = {
 	.probe = wm8350_wdt_probe,
-	.remove = wm8350_wdt_remove,
+	.remove = __devexit_p(wm8350_wdt_remove),
 	.driver = {
 		.name = "wm8350-wdt",
 	},
Signature · 1 line
1.5.6.5
#1 lore raw

Hi Mark,

Quoted 3 lines

The probe and remove functions were incorrectly annotated, with the misannotation of the remove function causing build failures when built in.

I'll add it to the linux-2.6-watchdog-next tree tonight. I'll probably sent it in for mainline inclusion this weekend.

Kind regards,
Wim.