Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=08113e39dfd3d91053e8f1855fc0dc15305fb4c0
Commit: 08113e39dfd3d91053e8f1855fc0dc15305fb4c0
Parent: c87b639a2a34ea2912000ee1b1bd313d46fda276
Author: Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 31 08:15:34 2007 +0000
Committer: Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Fri Nov 2 22:25:35 2007 +0000
[WATCHDOG] iTCO_wdt.c init & exit fixes
Mark init and exit procedures as __devinit & _-devexit.
Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
---
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 cd7b002..1646660 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -600,7 +600,7 @@ static struct miscdevice iTCO_wdt_miscdev = {
* Init & exit routines
*/
-static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id
*ent, struct platform_device *dev)
+static int __devinit iTCO_wdt_init(struct pci_dev *pdev, const struct
pci_device_id *ent, struct platform_device *dev)
{
int ret;
u32 base_address;
@@ -704,7 +704,7 @@ out:
return ret;
}
-static void iTCO_wdt_cleanup(void)
+static void __devexit iTCO_wdt_cleanup(void)
{
/* Stop the timer before we leave */
if (!nowayout)
@@ -719,7 +719,7 @@ static void iTCO_wdt_cleanup(void)
iTCO_wdt_private.ACPIBASE = 0;
}
-static int iTCO_wdt_probe(struct platform_device *dev)
+static int __devinit iTCO_wdt_probe(struct platform_device *dev)
{
int found = 0;
struct pci_dev *pdev = NULL;
@@ -745,7 +745,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
return 0;
}
-static int iTCO_wdt_remove(struct platform_device *dev)
+static int __devexit iTCO_wdt_remove(struct platform_device *dev)
{
if (iTCO_wdt_private.ACPIBASE)
iTCO_wdt_cleanup();
@@ -763,7 +763,7 @@ static void iTCO_wdt_shutdown(struct platform_device *dev)
static struct platform_driver iTCO_wdt_driver = {
.probe = iTCO_wdt_probe,
- .remove = iTCO_wdt_remove,
+ .remove = __devexit_p(iTCO_wdt_remove),
.shutdown = iTCO_wdt_shutdown,
.suspend = iTCO_wdt_suspend,
.resume = iTCO_wdt_resume,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
