Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753377AbaJVDuJ (ORCPT ); Tue, 21 Oct 2014 23:50:09 -0400 Received: from icp-osb-irony-out2.external.iinet.net.au ([203.59.1.218]:30255 "EHLO icp-osb-irony-out2.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707AbaJVDuI (ORCPT ); Tue, 21 Oct 2014 23:50:08 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AoUDALwoR1SVhxBY/2dsb2JhbAANT4Q6uSYGmzECgSUBhQABAQQnUQEQCw0BCgkWDwkDAgECAUUGAQwBBQIBAbhJlXEBAQEBAQEBAQIBAQEBAQEBARqGJYoyB4RLAQSlcoRTjUtagksBAQE X-IronPort-AV: E=Sophos;i="5.04,766,1406563200"; d="scan'208";a="267221857" Message-ID: <5447296C.5090806@uclinux.org> Date: Wed, 22 Oct 2014 13:50:04 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Guenter Roeck , linux-kernel@vger.kernel.org CC: linux-pm@vger.kernel.org, Geert Uytterhoeven , Joshua Thompson , linux-m68k@vger.kernel.org Subject: Re: [PATCH v2 04/47] m68k: Replace mach_power_off with pm_power_off References: <1413864783-3271-1-git-send-email-linux@roeck-us.net> <1413864783-3271-5-git-send-email-linux@roeck-us.net> In-Reply-To: <1413864783-3271-5-git-send-email-linux@roeck-us.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Guenter, On 21/10/14 14:12, Guenter Roeck wrote: > Replace mach_power_off with pm_power_off to simplify the subsequent > move of pm_power_off to generic code. > > Cc: Geert Uytterhoeven > Cc: Greg Ungerer > Cc: Joshua Thompson > Acked-by: Geert Uytterhoeven > Signed-off-by: Guenter Roeck I have no problem with the non-MMU affected parts. Acked-by: Greg Ungerer Regards Greg > --- > 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 > #include > #include > +#include > #include > #include > #include > @@ -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 > #include > #include > +#include > #include > #include > #include > @@ -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 > #include > #include > +#include > /* keyb */ > #include > #include > @@ -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; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/