From: Alexander Graf <agraf@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: Arnd Bergmann <arnd@arndb.de>, Geoff Levand <geoff@infradead.org>,
Alistair Popple <alistair@popple.id.au>,
Scott Wood <scottwood@freescale.com>,
Anatolij Gustschin <agust@denx.de>
Subject: [PATCH 20/20] powerpc: Remove ppc_md.power_off
Date: Wed, 1 Oct 2014 15:28:06 +0200 [thread overview]
Message-ID: <1412170086-57971-21-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1412170086-57971-1-git-send-email-agraf@suse.de>
Now that we have all implementations of ppc_md.power_off converted to
pm_power_off we can remove the ppc_md variant.
While at it, also set the default for pm_power_off to NULL so that non
machine drivers can implement overrides.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/include/asm/machdep.h | 1 -
arch/powerpc/kernel/setup-common.c | 6 ++----
arch/powerpc/xmon/xmon.c | 2 --
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index b125cea..10dc008 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -144,7 +144,6 @@ struct machdep_calls {
#endif
void (*restart)(char *cmd);
- void (*power_off)(void);
void (*halt)(void);
void (*panic)(char *str);
void (*cpu_die)(void);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 5dfcb28..58a260f 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -138,9 +138,7 @@ void machine_restart(char *cmd)
void machine_power_off(void)
{
machine_shutdown();
- if (ppc_md.power_off)
- ppc_md.power_off();
- if (pm_power_off != machine_power_off)
+ if (pm_power_off)
pm_power_off();
#ifdef CONFIG_SMP
smp_send_stop();
@@ -152,7 +150,7 @@ void machine_power_off(void)
/* Used by the G5 thermal driver */
EXPORT_SYMBOL_GPL(machine_power_off);
-void (*pm_power_off)(void) = machine_power_off;
+void (*pm_power_off)(void);
EXPORT_SYMBOL_GPL(pm_power_off);
void machine_halt(void)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 531f649..506d256 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -981,8 +981,6 @@ static void bootcmds(void)
else if (cmd == 'h')
ppc_md.halt();
else if (cmd == 'p')
- if (ppc_md.power_off)
- ppc_md.power_off();
if (pm_power_off)
pm_power_off();
}
--
1.8.1.4
next prev parent reply other threads:[~2014-10-01 13:28 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 13:27 [PATCH 00/20] powerpc: Convert power off logic to pm_power_off Alexander Graf
2014-10-01 13:27 ` [PATCH 01/20] powerpc: Support override of pm_power_off Alexander Graf
2014-10-01 13:27 ` [PATCH 02/20] powerpc/xmon: Support either ppc_md.power_off or pm_power_off Alexander Graf
2014-10-01 13:27 ` [PATCH 03/20] powerpc/47x: Use pm_power_off rather than ppc_md.power_off Alexander Graf
2014-10-05 0:39 ` Segher Boessenkool
2014-10-06 10:02 ` Alexander Graf
2014-10-01 13:27 ` [PATCH 04/20] powerpc/52xx/efika: " Alexander Graf
2014-10-01 13:27 ` [PATCH 05/20] powerpc/mpc8349emitx: " Alexander Graf
2014-10-01 13:27 ` [PATCH 06/20] powerpc/corenet: " Alexander Graf
2014-10-01 13:27 ` [PATCH 07/20] powerpc/85xx/sgy_cts1000: " Alexander Graf
2014-10-01 13:27 ` [PATCH 08/20] powerpc/celleb: " Alexander Graf
2014-10-01 13:27 ` [PATCH 09/20] powerpc/cell/qpace: " Alexander Graf
2014-10-01 13:27 ` [PATCH 10/20] powerpc/cell: " Alexander Graf
2014-10-01 13:27 ` [PATCH 11/20] powerpc/chrp: " Alexander Graf
2014-10-01 13:27 ` [PATCH 12/20] powerpc/6xx/gamecube: " Alexander Graf
2014-10-01 13:27 ` [PATCH 13/20] powerpc/6xx/linkstation: " Alexander Graf
2014-10-01 13:28 ` [PATCH 14/20] powerpc/6xx/wii: " Alexander Graf
2014-10-01 13:28 ` [PATCH 15/20] powerpc/maple: " Alexander Graf
2014-10-01 13:28 ` [PATCH 16/20] powerpc/powermac: " Alexander Graf
2014-10-01 13:28 ` [PATCH 17/20] powerpc/powernv: " Alexander Graf
2014-10-01 13:28 ` [PATCH 18/20] powerpc/ps3: " Alexander Graf
2014-10-01 13:28 ` [PATCH 19/20] powerpc/pseries: " Alexander Graf
2014-10-01 13:28 ` Alexander Graf [this message]
2014-10-01 14:33 ` [PATCH 00/20] powerpc: Convert power off logic to pm_power_off Geert Uytterhoeven
2014-10-01 14:47 ` Alexander Graf
2014-10-01 14:57 ` Geert Uytterhoeven
2014-10-01 15:54 ` Guenter Roeck
2014-10-01 21:25 ` Alexander Graf
2014-10-02 2:36 ` Guenter Roeck
2014-10-01 22:39 ` Scott Wood
2014-10-01 23:21 ` Alexander Graf
2014-10-01 23:28 ` Scott Wood
2014-10-01 23:44 ` Alexander Graf
2014-10-02 2:51 ` Guenter Roeck
2014-10-03 4:42 ` Michael Ellerman
2014-10-06 10:00 ` Alexander Graf
2014-10-07 6:25 ` Michael Ellerman
2014-10-07 11:35 ` Alexander Graf
2014-10-07 17:00 ` Guenter Roeck
2014-10-07 17:47 ` Alexander Graf
2014-10-07 19:03 ` 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=1412170086-57971-21-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=agust@denx.de \
--cc=alistair@popple.id.au \
--cc=arnd@arndb.de \
--cc=geoff@infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=scottwood@freescale.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).