From: Guenter Roeck <linux@roeck-us.net> To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, Geert Uytterhoeven <geert@linux-m68k.org>, Greg Ungerer <gerg@uclinux.org>, Joshua Thompson <funaho@jurai.org>, linux-m68k@vger.kernel.org Subject: [PATCH v5 04/48] m68k: Replace mach_power_off with pm_power_off Date: Thu, 6 Nov 2014 08:42:48 -0800 [thread overview] Message-ID: <1415292213-28652-5-git-send-email-linux@roeck-us.net> (raw) In-Reply-To: <1415292213-28652-1-git-send-email-linux@roeck-us.net> Replace mach_power_off with pm_power_off to simplify the subsequent move of pm_power_off to generic code. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Ungerer <gerg@uclinux.org> Cc: Joshua Thompson <funaho@jurai.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v5: - Rebase to v3.18-rc3 v4: - No change v3: - No change v2: - have_kernel_poweroff -> have_kernel_power_off arch/m68k/emu/natfeat.c | 3 ++- arch/m68k/include/asm/machdep.h | 1 - arch/m68k/kernel/process.c | 5 +++-- arch/m68k/kernel/setup_mm.c | 1 - arch/m68k/kernel/setup_no.c | 1 - arch/m68k/mac/config.c | 3 ++- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c index 71b78ec..91e2ae7 100644 --- a/arch/m68k/emu/natfeat.c +++ b/arch/m68k/emu/natfeat.c @@ -15,6 +15,7 @@ #include <linux/string.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/pm.h> #include <linux/io.h> #include <asm/machdep.h> #include <asm/natfeat.h> @@ -90,5 +91,5 @@ void __init nf_init(void) pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16, version & 0xffff); - mach_power_off = nf_poweroff; + pm_power_off = nf_poweroff; } diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h index 953ca21..f9fac51 100644 --- a/arch/m68k/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep.h @@ -24,7 +24,6 @@ extern int (*mach_set_rtc_pll)(struct rtc_pll_info *); extern int (*mach_set_clock_mmss)(unsigned long); extern void (*mach_reset)( void ); extern void (*mach_halt)( void ); -extern void (*mach_power_off)( void ); extern unsigned long (*mach_hd_init) (unsigned long, unsigned long); extern void (*mach_hd_setup)(char *, int *); extern long mach_max_dma_address; diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index c55ff71..afe3d6e 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -22,6 +22,7 @@ #include <linux/unistd.h> #include <linux/ptrace.h> #include <linux/user.h> +#include <linux/pm.h> #include <linux/reboot.h> #include <linux/init_task.h> #include <linux/mqueue.h> @@ -77,8 +78,8 @@ void machine_halt(void) void machine_power_off(void) { - if (mach_power_off) - mach_power_off(); + if (pm_power_off) + pm_power_off(); for (;;); } diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 5b8ec4d..002fea6 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -96,7 +96,6 @@ EXPORT_SYMBOL(mach_get_rtc_pll); EXPORT_SYMBOL(mach_set_rtc_pll); void (*mach_reset)( void ); void (*mach_halt)( void ); -void (*mach_power_off)( void ); long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ #ifdef CONFIG_HEARTBEAT void (*mach_heartbeat) (int); diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 88c27d9..1520156 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -55,7 +55,6 @@ int (*mach_hwclk) (int, struct rtc_time*); /* machine dependent reboot functions */ void (*mach_reset)(void); void (*mach_halt)(void); -void (*mach_power_off)(void); #ifdef CONFIG_M68000 #if defined(CONFIG_M68328) diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index a471eab..677913ff 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -16,6 +16,7 @@ #include <linux/tty.h> #include <linux/console.h> #include <linux/interrupt.h> +#include <linux/pm.h> /* keyb */ #include <linux/random.h> #include <linux/delay.h> @@ -159,7 +160,7 @@ void __init config_mac(void) mach_set_clock_mmss = mac_set_clock_mmss; mach_reset = mac_reset; mach_halt = mac_poweroff; - mach_power_off = mac_poweroff; + pm_power_off = mac_poweroff; mach_max_dma_address = 0xffffffff; #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) mach_beep = mac_mksound; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux@roeck-us.net> To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, Geert Uytterhoeven <geert@linux-m68k.org>, Greg Ungerer <gerg@uclinux.org>, Joshua Thompson <funaho@jurai.org>, linux-m68k@lists.linux-m68k.org Subject: [PATCH v5 04/48] m68k: Replace mach_power_off with pm_power_off Date: Thu, 6 Nov 2014 08:42:48 -0800 [thread overview] Message-ID: <1415292213-28652-5-git-send-email-linux@roeck-us.net> (raw) In-Reply-To: <1415292213-28652-1-git-send-email-linux@roeck-us.net> Replace mach_power_off with pm_power_off to simplify the subsequent move of pm_power_off to generic code. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Ungerer <gerg@uclinux.org> Cc: Joshua Thompson <funaho@jurai.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v5: - Rebase to v3.18-rc3 v4: - No change v3: - No change v2: - have_kernel_poweroff -> have_kernel_power_off arch/m68k/emu/natfeat.c | 3 ++- arch/m68k/include/asm/machdep.h | 1 - arch/m68k/kernel/process.c | 5 +++-- arch/m68k/kernel/setup_mm.c | 1 - arch/m68k/kernel/setup_no.c | 1 - arch/m68k/mac/config.c | 3 ++- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c index 71b78ec..91e2ae7 100644 --- a/arch/m68k/emu/natfeat.c +++ b/arch/m68k/emu/natfeat.c @@ -15,6 +15,7 @@ #include <linux/string.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/pm.h> #include <linux/io.h> #include <asm/machdep.h> #include <asm/natfeat.h> @@ -90,5 +91,5 @@ void __init nf_init(void) pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16, version & 0xffff); - mach_power_off = nf_poweroff; + pm_power_off = nf_poweroff; } diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h index 953ca21..f9fac51 100644 --- a/arch/m68k/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep.h @@ -24,7 +24,6 @@ extern int (*mach_set_rtc_pll)(struct rtc_pll_info *); extern int (*mach_set_clock_mmss)(unsigned long); extern void (*mach_reset)( void ); extern void (*mach_halt)( void ); -extern void (*mach_power_off)( void ); extern unsigned long (*mach_hd_init) (unsigned long, unsigned long); extern void (*mach_hd_setup)(char *, int *); extern long mach_max_dma_address; diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index c55ff71..afe3d6e 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -22,6 +22,7 @@ #include <linux/unistd.h> #include <linux/ptrace.h> #include <linux/user.h> +#include <linux/pm.h> #include <linux/reboot.h> #include <linux/init_task.h> #include <linux/mqueue.h> @@ -77,8 +78,8 @@ void machine_halt(void) void machine_power_off(void) { - if (mach_power_off) - mach_power_off(); + if (pm_power_off) + pm_power_off(); for (;;); } diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 5b8ec4d..002fea6 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -96,7 +96,6 @@ EXPORT_SYMBOL(mach_get_rtc_pll); EXPORT_SYMBOL(mach_set_rtc_pll); void (*mach_reset)( void ); void (*mach_halt)( void ); -void (*mach_power_off)( void ); long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ #ifdef CONFIG_HEARTBEAT void (*mach_heartbeat) (int); diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 88c27d9..1520156 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -55,7 +55,6 @@ int (*mach_hwclk) (int, struct rtc_time*); /* machine dependent reboot functions */ void (*mach_reset)(void); void (*mach_halt)(void); -void (*mach_power_off)(void); #ifdef CONFIG_M68000 #if defined(CONFIG_M68328) diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index a471eab..677913ff 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -16,6 +16,7 @@ #include <linux/tty.h> #include <linux/console.h> #include <linux/interrupt.h> +#include <linux/pm.h> /* keyb */ #include <linux/random.h> #include <linux/delay.h> @@ -159,7 +160,7 @@ void __init config_mac(void) mach_set_clock_mmss = mac_set_clock_mmss; mach_reset = mac_reset; mach_halt = mac_poweroff; - mach_power_off = mac_poweroff; + pm_power_off = mac_poweroff; mach_max_dma_address = 0xffffffff; #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) mach_beep = mac_mksound; -- 1.9.1
next prev parent reply other threads:[~2014-11-06 16:43 UTC|newest] Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-11-06 16:42 [PATCH v5 00/48] kernel: Add support for power-off handler call chain Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 01/48] " Guenter Roeck 2014-11-06 22:30 ` Rafael J. Wysocki 2014-11-06 22:27 ` Guenter Roeck 2014-11-07 0:16 ` Rafael J. Wysocki 2014-11-07 3:00 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 02/48] memory: emif: Use API function to determine power-off capability Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 03/48] hibernate: Call have_kernel_power_off instead of checking pm_power_off Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 04/48] m68k: Replace mach_power_off with pm_power_off Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck [this message] 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 05/48] mfd: as3722: Drop reference to pm_power_off from devicetree bindings Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 06/48] gpio-poweroff: " Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 07/48] qnap-poweroff: " Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 08/48] kernel: Move pm_power_off to common code Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 09/48] mfd: palmas: Register with kernel power-off handler Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 10/48] mfd: axp20x: " Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 11/48] mfd: retu: " Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 12/48] mfd: ab8500-sysctrl: " Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 13/48] mfd: max8907: " Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 14/48] mfd: tps80031: " Guenter Roeck 2014-11-06 16:42 ` [PATCH v5 15/48] mfd: dm355evm_msp: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 16/48] mfd: tps6586x: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 17/48] mfd: tps65910: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 18/48] mfd: twl4030-power: " Guenter Roeck 2014-11-10 8:46 ` Pavel Machek 2014-11-10 14:09 ` Guenter Roeck 2014-11-10 14:49 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 19/48] mfd: rk808: Register power-off handler " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 20/48] mfd: rn5t618: " Guenter Roeck 2014-11-07 21:00 ` Beniamino Galvani 2014-11-08 4:19 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 21/48] ipmi: Register " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 22/48] power/reset: restart-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 23/48] power/reset: gpio-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 24/48] power/reset: as3722-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 25/48] power/reset: qnap-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 26/48] power/reset: msm-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 27/48] power/reset: vexpress-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 28/48] power/reset: at91-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 29/48] power/reset: ltc2952-poweroff: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 30/48] x86: iris: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 31/48] x86: apm: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 32/48] x86: olpc: Register xo1 power-off handler " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 33/48] staging: nvec: Register " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck [not found] ` <1415292213-28652-34-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> 2014-11-09 21:41 ` Marc Dietrich 2014-11-09 21:41 ` Marc Dietrich 2014-11-09 23:06 ` Andreas Färber 2014-11-09 23:06 ` Andreas Färber 2014-11-09 23:54 ` Guenter Roeck 2014-11-09 23:54 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 34/48] acpi: Register power-off handler " Guenter Roeck 2014-11-06 22:32 ` Rafael J. Wysocki 2014-11-07 19:47 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 35/48] arm: Register " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 36/48] arm64: psci: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 17:22 ` Mark Rutland 2014-11-06 17:22 ` Mark Rutland 2014-11-06 17:22 ` Mark Rutland 2014-11-06 18:51 ` Guenter Roeck 2014-11-06 18:51 ` Guenter Roeck 2014-11-06 18:51 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 37/48] avr32: atngw100: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 38/48] ia64: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 39/48] m68k: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 40/48] mips: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 41/48] powerpc: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 42/48] sh: " Guenter Roeck 2014-11-06 16:43 ` Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 43/48] x86: lguest: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 44/48] x86: ce4100: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 45/48] x86: intel-mid: Drop registration of dummy power-off handlers Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 46/48] x86: pmc_atom: Register power-off handler with kernel power-off handler Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 47/48] efi: " Guenter Roeck 2014-11-06 16:43 ` [PATCH v5 48/48] kernel: Remove pm_power_off Guenter Roeck 2014-11-06 17:08 ` [PATCH v5 00/48] kernel: Add support for power-off handler call chain Guenter Roeck 2014-11-06 17:08 ` Guenter Roeck 2014-11-06 18:02 ` Linus Torvalds 2014-11-06 18:48 ` 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=1415292213-28652-5-git-send-email-linux@roeck-us.net \ --to=linux@roeck-us.net \ --cc=funaho@jurai.org \ --cc=geert@linux-m68k.org \ --cc=gerg@uclinux.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-m68k@vger.kernel.org \ --cc=linux-pm@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: linkBe 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.