From: Guenter Roeck <linux@roeck-us.net>
To: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Dirk Eibach <dirk.eibach@gdsys.cc>
Subject: [RFC PATCH 1/2] watchdog: booke: Convert to platform driver
Date: Fri, 3 May 2013 08:56:45 -0700 [thread overview]
Message-ID: <1367596606-22476-1-git-send-email-linux@roeck-us.net> (raw)
Required to be able to add device tree support
Cc: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Guenter Roeck <linux@roeck-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
next reply other threads:[~2013-05-03 15:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-03 15:56 Guenter Roeck [this message]
2013-05-03 15:56 ` [RFC PATCH 2/2] watchdog: booke: Add device tree support Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367596606-22476-1-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=dirk.eibach@gdsys.cc \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).