Skip to content

Commit

Permalink
PM / Blackfin: Use struct syscore_ops instead of sysdevs for PM
Browse files Browse the repository at this point in the history
Convert some Blackfin architecture's code to using struct syscore_ops
objects for power management instead of sysdev classes and sysdevs.

This simplifies the code and reduces the kernel's memory footprint.
It also is necessary for removing sysdevs from the kernel entirely in
the future.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Rafael J. Wysocki committed Apr 24, 2011
1 parent bb072c3 commit 67f9cbf
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions arch/blackfin/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <linux/bitops.h>
#include <linux/hardirq.h>
#include <linux/sysdev.h>
#include <linux/syscore_ops.h>
#include <linux/pm.h>
#include <linux/nmi.h>
#include <linux/smp.h>
Expand Down Expand Up @@ -196,43 +196,31 @@ void touch_nmi_watchdog(void)

/* Suspend/resume support */
#ifdef CONFIG_PM
static int nmi_wdt_suspend(struct sys_device *dev, pm_message_t state)
static int nmi_wdt_suspend(void)
{
nmi_wdt_stop();
return 0;
}

static int nmi_wdt_resume(struct sys_device *dev)
static void nmi_wdt_resume(void)
{
if (nmi_active)
nmi_wdt_start();
return 0;
}

static struct sysdev_class nmi_sysclass = {
.name = DRV_NAME,
static struct syscore_ops nmi_syscore_ops = {
.resume = nmi_wdt_resume,
.suspend = nmi_wdt_suspend,
};

static struct sys_device device_nmi_wdt = {
.id = 0,
.cls = &nmi_sysclass,
};

static int __init init_nmi_wdt_sysfs(void)
static int __init init_nmi_wdt_syscore(void)
{
int error;

if (!nmi_active)
return 0;
if (nmi_active)
register_syscore_ops(&nmi_syscore_ops);

error = sysdev_class_register(&nmi_sysclass);
if (!error)
error = sysdev_register(&device_nmi_wdt);
return error;
return 0;
}
late_initcall(init_nmi_wdt_sysfs);
late_initcall(init_nmi_wdt_syscore);

#endif /* CONFIG_PM */

Expand Down

0 comments on commit 67f9cbf

Please sign in to comment.