From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Greg KH <gregkh@suse.de>, Jesse Barnes <jbarnes@virtuousgeek.org>,
mingo@redhat.com, Avi Kivity <avi@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Kay Sievers <kay.sievers@suse.de>,
Linux PM mailing list <linux-pm@lists.linux-foundation.org>,
tglx@linutronix.de
Subject: [PATCH 4/8] timekeeping: Use syscore_ops instead of sysdev class and sysdev
Date: Sat, 12 Mar 2011 22:17:33 +0100 [thread overview]
Message-ID: <201103122217.34004.rjw__12715.8249299557$1299965024$gmane$org@sisk.pl> (raw)
In-Reply-To: <201103122212.40828.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
The timekeeping subsystem uses a sysdev class and a sysdev for
executing timekeeping_suspend() after interrupts have been turned off
on the boot CPU (during system suspend) and for executing
timekeeping_resume() before turning on interrupts on the boot CPU
(during system resume). However, since both of these functions
ignore their arguments, the entire mechanism may be replaced with a
struct syscore_ops object which is simpler.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/time/timekeeping.c | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
Index: linux-2.6/kernel/time/timekeeping.c
===================================================================
--- linux-2.6.orig/kernel/time/timekeeping.c
+++ linux-2.6/kernel/time/timekeeping.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
#include <linux/time.h>
@@ -561,13 +561,12 @@ static struct timespec timekeeping_suspe
/**
* timekeeping_resume - Resumes the generic timekeeping subsystem.
- * @dev: unused
*
* This is for the generic clocksource timekeeping.
* xtime/wall_to_monotonic/jiffies/etc are
* still managed by arch specific suspend/resume code.
*/
-static int timekeeping_resume(struct sys_device *dev)
+static void timekeeping_resume(void)
{
unsigned long flags;
struct timespec ts;
@@ -596,11 +595,9 @@ static int timekeeping_resume(struct sys
/* Resume hrtimers */
hres_timers_resume();
-
- return 0;
}
-static int timekeeping_suspend(struct sys_device *dev, pm_message_t state)
+static int timekeeping_suspend(void)
{
unsigned long flags;
@@ -618,26 +615,18 @@ static int timekeeping_suspend(struct sy
}
/* sysfs resume/suspend bits for timekeeping */
-static struct sysdev_class timekeeping_sysclass = {
- .name = "timekeeping",
+static struct syscore_ops timekeeping_syscore_ops = {
.resume = timekeeping_resume,
.suspend = timekeeping_suspend,
};
-static struct sys_device device_timer = {
- .id = 0,
- .cls = &timekeeping_sysclass,
-};
-
-static int __init timekeeping_init_device(void)
+static int __init timekeeping_init_ops(void)
{
- int error = sysdev_class_register(&timekeeping_sysclass);
- if (!error)
- error = sysdev_register(&device_timer);
- return error;
+ register_syscore_ops(&timekeeping_syscore_ops);
+ return 0;
}
-device_initcall(timekeeping_init_device);
+device_initcall(timekeeping_init_ops);
/*
* If the error is already larger, we look ahead even further
next prev parent reply other threads:[~2011-03-12 21:17 UTC|newest]
Thread overview: 198+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 0:31 [RFC][PATCH 0/2] Allow subsystems to avoid using sysdevs for defining "core" PM callbacks Rafael J. Wysocki
2011-03-10 0:33 ` [RFC][PATCH 1/2] Introduce struct syscore_ops and related functionality Rafael J. Wysocki
2011-03-10 0:33 ` Rafael J. Wysocki
2011-03-10 3:33 ` [linux-pm] " Alan Stern
2011-03-10 10:42 ` Rafael J. Wysocki
2011-03-10 10:42 ` Rafael J. Wysocki
2011-03-10 11:30 ` [RFC][Update][PATCH " Rafael J. Wysocki
2011-03-11 17:11 ` Greg KH
2011-03-11 17:11 ` Greg KH
2011-03-11 20:13 ` Rafael J. Wysocki
2011-03-11 20:13 ` Rafael J. Wysocki
2011-03-11 20:16 ` Greg KH
2011-03-11 20:33 ` Rafael J. Wysocki
2011-03-11 20:33 ` Rafael J. Wysocki
2011-03-11 20:16 ` Greg KH
2011-03-10 11:30 ` Rafael J. Wysocki
2011-03-10 3:33 ` [RFC][PATCH " Alan Stern
2011-03-10 0:34 ` [RFC][PATCH 2/2] Convert several sysdev users to using struct syscore_ops Rafael J. Wysocki
2011-03-10 0:34 ` Rafael J. Wysocki
2011-03-11 17:12 ` Greg KH
2011-03-11 17:12 ` Greg KH
2011-03-11 20:29 ` Rafael J. Wysocki
2011-03-11 20:29 ` Rafael J. Wysocki
2011-03-11 20:33 ` Greg KH
2011-03-11 20:33 ` Greg KH
2011-03-11 20:45 ` Rafael J. Wysocki
2011-03-11 20:45 ` Rafael J. Wysocki
2011-03-10 13:05 ` [RFC][PATCH 0/2] Allow subsystems to avoid using sysdevs for defining "core" PM callbacks Kay Sievers
2011-03-10 13:05 ` Kay Sievers
2011-03-10 19:04 ` Rafael J. Wysocki
2011-03-10 19:04 ` Rafael J. Wysocki
2011-03-12 21:12 ` [PATCH 0/8] " Rafael J. Wysocki
2011-03-12 21:12 ` Rafael J. Wysocki
2011-03-12 21:13 ` [PATCH 1/8] PM / Core: Introcude struct syscore_ops Rafael J. Wysocki
2011-03-12 21:13 ` Rafael J. Wysocki
2011-03-12 21:15 ` [PATCH 2/8] x86: Use syscore_ops instead of sysdev classes and sysdevs Rafael J. Wysocki
2011-03-12 21:15 ` Rafael J. Wysocki
2011-03-13 14:23 ` Thomas Gleixner
2011-03-13 15:07 ` Rafael J. Wysocki
2011-03-13 15:07 ` Rafael J. Wysocki
2011-03-13 14:23 ` Thomas Gleixner
2011-03-12 21:16 ` [PATCH 3/8] ACPI: Use syscore_ops instead of sysdev class and sysdev Rafael J. Wysocki
2011-03-18 21:38 ` Len Brown
2011-03-18 21:38 ` Len Brown
2011-03-12 21:16 ` Rafael J. Wysocki
2011-03-12 21:17 ` [PATCH 4/8] timekeeping: " Rafael J. Wysocki
2011-03-13 13:56 ` Thomas Gleixner
2011-03-13 13:56 ` Thomas Gleixner
2011-03-13 15:08 ` Rafael J. Wysocki
2011-03-13 15:08 ` Rafael J. Wysocki
2011-03-12 21:17 ` Rafael J. Wysocki [this message]
2011-03-12 21:18 ` [PATCH 5/8] PCI / Intel IOMMU: " Rafael J. Wysocki
2011-03-12 21:18 ` Rafael J. Wysocki
2011-06-02 17:30 ` Tony Luck
2011-06-06 17:57 ` Rafael J. Wysocki
2011-06-06 17:58 ` Luck, Tony
2011-06-06 17:58 ` Luck, Tony
2011-06-06 17:57 ` Rafael J. Wysocki
2011-06-02 17:30 ` Tony Luck
2011-03-12 21:18 ` [PATCH 6/8] KVM: " Rafael J. Wysocki
2011-03-12 21:18 ` Rafael J. Wysocki
2011-03-12 21:20 ` [PATCH 7/8] cpufreq: Use syscore_ops for boot CPU suspend/resume Rafael J. Wysocki
2011-03-12 21:20 ` Rafael J. Wysocki
2011-03-15 21:43 ` [Update, v2] " Rafael J. Wysocki
2011-03-15 21:43 ` Rafael J. Wysocki
2011-03-12 21:21 ` [PATCH 8/8] Introduce ARCH_NO_SYSDEV_OPS config option Rafael J. Wysocki
2011-03-13 13:55 ` Thomas Gleixner
2011-03-13 13:55 ` Thomas Gleixner
2011-03-13 15:30 ` [Update] " Rafael J. Wysocki
2011-03-13 15:30 ` Rafael J. Wysocki
2011-03-12 21:21 ` Rafael J. Wysocki
2011-03-13 13:02 ` [PATCH 9-10/10] Allow subsystems to avoid using sysdevs for defining "core" PM callbacks Rafael J. Wysocki
2011-03-13 13:02 ` Rafael J. Wysocki
2011-03-13 13:03 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev R. J. Wysocki
2011-03-13 13:03 ` R. J. Wysocki
2011-03-17 8:20 ` Paul Mundt
2011-03-17 8:20 ` Paul Mundt
2011-03-19 0:47 ` Rafael J. Wysocki
2011-03-19 0:47 ` Rafael J. Wysocki
2011-03-22 14:04 ` Paul Mundt
2011-03-22 14:04 ` Paul Mundt
2011-03-22 14:04 ` Paul Mundt
2011-03-22 14:19 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 14:19 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 20:30 ` Rafael J. Wysocki
2011-03-22 20:30 ` Rafael J. Wysocki
2011-03-22 20:30 ` Rafael J. Wysocki
2011-03-22 20:39 ` Kay Sievers
2011-03-22 20:39 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 20:39 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 21:00 ` Rafael J. Wysocki
2011-03-22 21:00 ` Rafael J. Wysocki
2011-03-22 21:00 ` Rafael J. Wysocki
2011-03-22 21:12 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 21:12 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 21:49 ` Paul Mundt
2011-03-22 21:49 ` Paul Mundt
2011-03-22 21:49 ` Paul Mundt
2011-03-22 22:00 ` Kay Sievers
2011-03-22 22:00 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 22:00 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 22:23 ` Rafael J. Wysocki
2011-03-22 22:23 ` Rafael J. Wysocki
2011-03-22 22:23 ` Rafael J. Wysocki
2011-03-22 22:44 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 22:44 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 23:32 ` Rafael J. Wysocki
2011-03-22 23:32 ` Rafael J. Wysocki
2011-03-22 23:32 ` Rafael J. Wysocki
2011-03-22 23:46 ` Kay Sievers
2011-03-22 23:46 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 23:46 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 23:50 ` Rafael J. Wysocki
2011-03-22 23:50 ` Rafael J. Wysocki
2011-03-22 23:50 ` Rafael J. Wysocki
2011-03-23 9:45 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Russell King - ARM Linux
2011-03-23 9:45 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Russell King - ARM Linux
2011-03-23 9:45 ` Russell King - ARM Linux
2011-03-22 22:44 ` Kay Sievers
2011-03-22 22:23 ` Paul Mundt
2011-03-22 22:23 ` Paul Mundt
2011-03-23 11:12 ` Mark Brown
2011-03-23 11:12 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Mark Brown
2011-03-23 11:12 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Mark Brown
2011-03-23 11:28 ` Paul Mundt
2011-03-23 11:28 ` Paul Mundt
2011-03-23 11:28 ` Paul Mundt
2011-03-22 22:23 ` Paul Mundt
2011-03-22 22:05 ` Rafael J. Wysocki
2011-03-22 22:05 ` Rafael J. Wysocki
2011-03-22 22:20 ` Kay Sievers
2011-03-22 22:20 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 22:20 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 22:42 ` Rafael J. Wysocki
2011-03-22 22:42 ` Rafael J. Wysocki
2011-03-22 22:42 ` Rafael J. Wysocki
2011-03-22 22:56 ` Kay Sievers
2011-03-22 22:56 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 22:56 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 23:05 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev Kay Sievers
2011-03-22 23:05 ` [PATCH 9/10] sh: Use struct syscore_ops instead of sysdev class and sysdev Kay Sievers
2011-03-22 23:47 ` Rafael J. Wysocki
2011-03-22 23:47 ` Rafael J. Wysocki
2011-03-22 23:47 ` Rafael J. Wysocki
2011-03-22 23:05 ` Kay Sievers
2011-03-22 22:05 ` Rafael J. Wysocki
2011-03-22 21:12 ` Kay Sievers
2011-03-22 14:19 ` Kay Sievers
2011-03-22 20:19 ` Rafael J. Wysocki
2011-03-22 20:19 ` Rafael J. Wysocki
2011-03-22 20:19 ` Rafael J. Wysocki
2011-03-23 9:59 ` Paul Mundt
2011-03-23 9:59 ` Paul Mundt
2011-03-23 20:39 ` Rafael J. Wysocki
2011-03-23 20:39 ` Rafael J. Wysocki
2011-03-23 20:39 ` Rafael J. Wysocki
2011-03-23 9:59 ` Paul Mundt
2011-03-19 0:47 ` Rafael J. Wysocki
2011-03-17 8:20 ` Paul Mundt
2011-03-13 13:03 ` R. J. Wysocki
2011-03-13 13:04 ` [PATCH 10/10] ARM: Use struct syscore_ops instead of sysdevs for PM in timer and leds Rafael J. Wysocki
2011-03-13 13:04 ` Rafael J. Wysocki
2011-03-13 13:04 ` Rafael J. Wysocki
2011-03-14 9:06 ` Stephen Boyd
2011-03-14 9:06 ` [PATCH 10/10] ARM: Use struct syscore_ops instead of sysdevs Stephen Boyd
2011-03-14 9:06 ` [PATCH 10/10] ARM: Use struct syscore_ops instead of sysdevs for PM in timer and leds Stephen Boyd
2011-03-14 19:54 ` [Update] " Rafael J. Wysocki
2011-03-14 19:54 ` Rafael J. Wysocki
2011-03-14 19:54 ` Rafael J. Wysocki
2011-03-13 13:02 ` [PATCH 9-10/10] Allow subsystems to avoid using sysdevs for defining "core" PM callbacks Rafael J. Wysocki
2011-03-21 23:31 ` [PATCH 0/6] Do not use sysdevs for implementing "core" PM operations on x86 Rafael J. Wysocki
2011-03-21 23:31 ` Rafael J. Wysocki
2011-03-21 23:34 ` [PATCH 1/6] x86: Use syscore_ops instead of sysdev classes and sysdevs Rafael J. Wysocki
2011-03-21 23:34 ` Rafael J. Wysocki
2011-03-21 23:35 ` [PATCH 2/6] timekeeping: Use syscore_ops instead of sysdev class and sysdev Rafael J. Wysocki
2011-03-21 23:35 ` Rafael J. Wysocki
2011-03-21 23:36 ` [PATCH 3/6] PCI / Intel IOMMU: " Rafael J. Wysocki
2011-03-22 10:57 ` Joerg Roedel
2011-03-22 22:07 ` Rafael J. Wysocki
2011-03-22 22:07 ` Rafael J. Wysocki
2011-03-23 7:48 ` Roedel, Joerg
2011-03-23 7:48 ` Roedel, Joerg
2011-03-22 10:57 ` Joerg Roedel
2011-03-21 23:36 ` Rafael J. Wysocki
2011-03-21 23:37 ` [PATCH 4/6] KVM: " Rafael J. Wysocki
2011-03-21 23:37 ` Rafael J. Wysocki
2011-03-22 9:18 ` Avi Kivity
2011-03-22 9:18 ` Avi Kivity
2011-03-21 23:38 ` [PATCH 5/6] cpufreq: Use syscore_ops for boot CPU suspend/resume (v2) Rafael J. Wysocki
2011-03-21 23:38 ` Rafael J. Wysocki
2011-03-21 23:38 ` [PATCH 6/6] Introduce ARCH_NO_SYSDEV_OPS config option (v2) Rafael J. Wysocki
2011-03-21 23:38 ` Rafael J. Wysocki
2011-03-22 10:32 ` [PATCH 0/6] Do not use sysdevs for implementing "core" PM operations on x86 Ingo Molnar
2011-03-22 20:33 ` Rafael J. Wysocki
2011-03-22 20:33 ` Rafael J. Wysocki
2011-03-25 22:51 ` [GIT PULL] More power management updates for 2.6.39 Rafael J. Wysocki
2011-03-25 22:51 ` Rafael J. Wysocki
2011-03-22 10:32 ` [PATCH 0/6] Do not use sysdevs for implementing "core" PM operations on x86 Ingo Molnar
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='201103122217.34004.rjw__12715.8249299557$1299965024$gmane$org@sisk.pl' \
--to=rjw@sisk.pl \
--cc=avi@redhat.com \
--cc=gregkh@suse.de \
--cc=hpa@zytor.com \
--cc=jbarnes@virtuousgeek.org \
--cc=kay.sievers@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.