Skip to content

Commit

Permalink
powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
Browse files Browse the repository at this point in the history
We check for a valid handler before calling ppc_md.machine_kexec_prepare
so we can just remove these empty handlers.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Anton Blanchard authored and Benjamin Herrenschmidt committed Jan 21, 2011
1 parent 2bb44d6 commit c6baabf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
11 changes: 0 additions & 11 deletions arch/powerpc/platforms/embedded6xx/gamecube.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,6 @@ static void gamecube_shutdown(void)
flipper_quiesce();
}

#ifdef CONFIG_KEXEC
static int gamecube_kexec_prepare(struct kimage *image)
{
return 0;
}
#endif /* CONFIG_KEXEC */


define_machine(gamecube) {
.name = "gamecube",
.probe = gamecube_probe,
Expand All @@ -95,9 +87,6 @@ define_machine(gamecube) {
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
.machine_shutdown = gamecube_shutdown,
#ifdef CONFIG_KEXEC
.machine_kexec_prepare = gamecube_kexec_prepare,
#endif
};


Expand Down
11 changes: 0 additions & 11 deletions arch/powerpc/platforms/embedded6xx/wii.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/seq_file.h>
#include <linux/kexec.h>
#include <linux/of_platform.h>
#include <linux/memblock.h>
#include <mm/mmu_decl.h>
Expand Down Expand Up @@ -226,13 +225,6 @@ static void wii_shutdown(void)
flipper_quiesce();
}

#ifdef CONFIG_KEXEC
static int wii_machine_kexec_prepare(struct kimage *image)
{
return 0;
}
#endif /* CONFIG_KEXEC */

define_machine(wii) {
.name = "wii",
.probe = wii_probe,
Expand All @@ -246,9 +238,6 @@ define_machine(wii) {
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
.machine_shutdown = wii_shutdown,
#ifdef CONFIG_KEXEC
.machine_kexec_prepare = wii_machine_kexec_prepare,
#endif
};

static struct of_device_id wii_of_bus[] = {
Expand Down

0 comments on commit c6baabf

Please sign in to comment.