Hi,
The experimental patch below replaces sys_device, used by the timekeeping code
to register the suspend and resume callbacks, with a platform device.
For me, personally, the main motivation for doing such a thing is that I'm working
on a hibernation framework separate from the suspend framework that we have
right now and I wouldn't like to have to deal with the sysdevs in it.
Apart from this, IIRC, in one of the recent discussions on linux-pm everyone
seemed to agree that it would be desirable to get rid of sysdevs.
Anyway, please let me know if the approach used in the patch is correct, as I'd
like to make some more similar changes shortly.
Greetings,
Rafael
---
From: Rafael J. Wysocki <[email protected]>
Replace sys_device used by the timekeeping code for registering suspend and
resume callbacks with a platform device.
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
kernel/time/timekeeping.c | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
Index: linux-2.6.22-rc7/kernel/time/timekeeping.c
===================================================================
--- linux-2.6.22-rc7.orig/kernel/time/timekeeping.c 2007-07-02 08:56:08.000000000 +0200
+++ linux-2.6.22-rc7/kernel/time/timekeeping.c 2007-07-02 09:06:18.000000000 +0200
@@ -13,7 +13,7 @@
#include <linux/percpu.h>
#include <linux/init.h>
#include <linux/mm.h>
-#include <linux/sysdev.h>
+#include <linux/platform_device.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
#include <linux/time.h>
@@ -268,7 +268,7 @@ static unsigned long timekeeping_suspend
* xtime/wall_to_monotonic/jiffies/etc are
* still managed by arch specific suspend/resume code.
*/
-static int timekeeping_resume(struct sys_device *dev)
+static int timekeeping_resume(struct platform_device *dev)
{
unsigned long flags;
unsigned long now = read_persistent_clock();
@@ -299,7 +299,7 @@ static int timekeeping_resume(struct sys
return 0;
}
-static int timekeeping_suspend(struct sys_device *dev, pm_message_t state)
+static int timekeeping_suspend(struct platform_device *dev, pm_message_t state)
{
unsigned long flags;
@@ -314,22 +314,30 @@ static int timekeeping_suspend(struct sy
}
/* sysfs resume/suspend bits for timekeeping */
-static struct sysdev_class timekeeping_sysclass = {
- .resume = timekeeping_resume,
- .suspend = timekeeping_suspend,
- set_kset_name("timekeeping"),
+static struct platform_device timekeeping_dev = {
+ .name = "timekeeping",
+ .id = -1,
};
-static struct sys_device device_timer = {
- .id = 0,
- .cls = &timekeeping_sysclass,
+static int __init timekeeping_probe(struct platform_device *dev)
+{
+ return (dev == &timekeeping_dev) ? 0 : -ENODEV;
+}
+
+static struct platform_driver timekeeping_drv = {
+ .driver = {
+ .name = "timekeeping",
+ },
+ .suspend_late = timekeeping_suspend,
+ .resume_early = timekeeping_resume,
};
static int __init timekeeping_init_device(void)
{
- int error = sysdev_class_register(&timekeeping_sysclass);
+ int error = platform_device_register(&timekeeping_dev);
if (!error)
- error = sysdev_register(&device_timer);
+ error = platform_driver_probe(&timekeeping_drv,
+ timekeeping_probe);
return error;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
