| Message ID | 201104172311.59289.rjw@sisk.pl (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On Sun, Apr 17, 2011 at 17:11, Rafael J. Wysocki wrote: > 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. looks straight forward enough ... Acked-by: Mike Frysinger <vapier@gentoo.org> > +static struct syscore_ops nmi_syscore_ops = { > .resume = nmi_wdt_resume, > .suspend = nmi_wdt_suspend, > }; a bit sad this couldnt be made const -mike -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday, April 18, 2011, Mike Frysinger wrote: > On Sun, Apr 17, 2011 at 17:11, Rafael J. Wysocki wrote: > > 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. > > looks straight forward enough ... > Acked-by: Mike Frysinger <vapier@gentoo.org> > > > +static struct syscore_ops nmi_syscore_ops = { > > .resume = nmi_wdt_resume, > > .suspend = nmi_wdt_suspend, > > }; > > a bit sad this couldnt be made const Well, that would trigger a compiler warning from register_syscore_ops(). However, I'm going to make that change change everywhere at once when all of the conversions have been made, since it looks like we're only going to have static syscore_ops. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6/arch/blackfin/kernel/nmi.c =================================================================== --- linux-2.6.orig/arch/blackfin/kernel/nmi.c +++ linux-2.6/arch/blackfin/kernel/nmi.c @@ -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> @@ -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 */