diff options
| -rw-r--r-- | drivers/watchdog/iTCO_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index cd7b00208c50..16466604effd 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
| @@ -600,7 +600,7 @@ static struct miscdevice iTCO_wdt_miscdev = { | |||
| 600 | * Init & exit routines | 600 | * Init & exit routines |
| 601 | */ | 601 | */ |
| 602 | 602 | ||
| 603 | static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent, struct platform_device *dev) | 603 | static int __devinit iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent, struct platform_device *dev) |
| 604 | { | 604 | { |
| 605 | int ret; | 605 | int ret; |
| 606 | u32 base_address; | 606 | u32 base_address; |
| @@ -704,7 +704,7 @@ out: | |||
| 704 | return ret; | 704 | return ret; |
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | static void iTCO_wdt_cleanup(void) | 707 | static void __devexit iTCO_wdt_cleanup(void) |
| 708 | { | 708 | { |
| 709 | /* Stop the timer before we leave */ | 709 | /* Stop the timer before we leave */ |
| 710 | if (!nowayout) | 710 | if (!nowayout) |
| @@ -719,7 +719,7 @@ static void iTCO_wdt_cleanup(void) | |||
| 719 | iTCO_wdt_private.ACPIBASE = 0; | 719 | iTCO_wdt_private.ACPIBASE = 0; |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | static int iTCO_wdt_probe(struct platform_device *dev) | 722 | static int __devinit iTCO_wdt_probe(struct platform_device *dev) |
| 723 | { | 723 | { |
| 724 | int found = 0; | 724 | int found = 0; |
| 725 | struct pci_dev *pdev = NULL; | 725 | struct pci_dev *pdev = NULL; |
| @@ -745,7 +745,7 @@ static int iTCO_wdt_probe(struct platform_device *dev) | |||
| 745 | return 0; | 745 | return 0; |
| 746 | } | 746 | } |
| 747 | 747 | ||
| 748 | static int iTCO_wdt_remove(struct platform_device *dev) | 748 | static int __devexit iTCO_wdt_remove(struct platform_device *dev) |
| 749 | { | 749 | { |
| 750 | if (iTCO_wdt_private.ACPIBASE) | 750 | if (iTCO_wdt_private.ACPIBASE) |
| 751 | iTCO_wdt_cleanup(); | 751 | iTCO_wdt_cleanup(); |
| @@ -763,7 +763,7 @@ static void iTCO_wdt_shutdown(struct platform_device *dev) | |||
| 763 | 763 | ||
| 764 | static struct platform_driver iTCO_wdt_driver = { | 764 | static struct platform_driver iTCO_wdt_driver = { |
| 765 | .probe = iTCO_wdt_probe, | 765 | .probe = iTCO_wdt_probe, |
| 766 | .remove = iTCO_wdt_remove, | 766 | .remove = __devexit_p(iTCO_wdt_remove), |
| 767 | .shutdown = iTCO_wdt_shutdown, | 767 | .shutdown = iTCO_wdt_shutdown, |
| 768 | .suspend = iTCO_wdt_suspend, | 768 | .suspend = iTCO_wdt_suspend, |
| 769 | .resume = iTCO_wdt_resume, | 769 | .resume = iTCO_wdt_resume, |
