linux-kernel - [RFC PATCH 1/2] watchdog: booke: Convert to platform driver

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri,  3 May 2013 08:56:45 -0700
From:	Guenter Roeck <linux@...ck-us.net>
To:	linux-watchdog@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, Guenter Roeck <linux@...ck-us.net>,
	Dirk Eibach <dirk.eibach@...ys.cc>
Subject: [RFC PATCH 1/2] watchdog: booke: Convert to platform driver

Required to be able to add device tree support

Cc: Dirk Eibach <dirk.eibach@...ys.cc>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
Compile tested only. I'll test it on a real system over the weekend
or early next week.

 drivers/watchdog/booke_wdt.c |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index a8dbceb3..9b066b9 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/watchdog.h>
+#include <linux/platform_device.h>
 
 #include <asm/reg_booke.h>
 #include <asm/time.h>
@@ -218,17 +219,24 @@ static struct watchdog_device booke_wdt_dev = {
 	.max_timeout = 0xFFFF
 };
 
-static void __exit booke_wdt_exit(void)
+static int booke_wdt_remove(struct platform_device *pdev)
 {
 	watchdog_unregister_device(&booke_wdt_dev);
+	return 0;
+}
+
+static void booke_wdt_shutdown(struct platform_device *pdev)
+{
+	booke_wdt_stop(&booke_wdt_dev);
 }
 
-static int __init booke_wdt_init(void)
+static int booke_wdt_probe(struct platform_device *pdev)
 {
 	int ret = 0;
 	bool nowayout = WATCHDOG_NOWAYOUT;
 
-	pr_info("powerpc book-e watchdog driver loaded\n");
+	dev_info(&pdev->dev, "powerpc book-e watchdog driver loaded\n");
+
 	booke_wdt_info.firmware_version = cur_cpu_spec->pvr_value;
 	booke_wdt_set_timeout(&booke_wdt_dev,
 			      period_to_sec(CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT));
@@ -241,8 +249,18 @@ static int __init booke_wdt_init(void)
 	return ret;
 }
 
-module_init(booke_wdt_init);
-module_exit(booke_wdt_exit);
+static struct platform_driver booke_wdt_driver = {
+	.probe = booke_wdt_probe,
+	.remove = booke_wdt_remove,
+	.shutdown = booke_wdt_shutdown,
+	.driver = {
+		.owner  = THIS_MODULE,
+		.name = "booke_wdt",
+	},
+};
+
+module_platform_driver(booke_wdt_driver);
 
 MODULE_DESCRIPTION("PowerPC Book-E watchdog driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:booke_wdt");
-- 
1.7.9.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/