Skip to content

Commit

Permalink
[PARISC] Add chassis_power_off routine
Browse files Browse the repository at this point in the history
Define a chassis_power_off routine that machines which have a way
to turn off the power supply can hook into. Formerly they were
using pm_power_off, which is now being used by generic code. Make
lasi.c use chassis_power_off instead of pm_power_off.

Note, all machines need to call machine_power_off so that the
switch can power off the machine, though halt -p may not necessarily
be able to work properly on the machine.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  • Loading branch information
Kyle McMartin authored and Kyle McMartin committed Jan 23, 2006
1 parent 526110f commit 85509c0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
13 changes: 5 additions & 8 deletions arch/parisc/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@
#include <asm/uaccess.h>
#include <asm/unwind.h>

/*
* Power off function, if any
*/
void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);

void default_idle(void)
{
barrier();
Expand Down Expand Up @@ -142,6 +136,7 @@ void machine_halt(void)
*/
}

void (*chassis_power_off)(void);

/*
* This routine is called from sys_reboot to actually turn off the
Expand All @@ -150,8 +145,8 @@ void machine_halt(void)
void machine_power_off(void)
{
/* If there is a registered power off handler, call it. */
if(pm_power_off)
pm_power_off();
if (chassis_power_off)
chassis_power_off();

/* Put the soft power button back under hardware control.
* If the user had already pressed the power button, the
Expand All @@ -167,6 +162,8 @@ void machine_power_off(void)
KERN_EMERG "Please power this system off now.");
}

void (*pm_power_off)(void) = machine_power_off;
EXPORT_SYMBOL(pm_power_off);

/*
* Create a kernel thread
Expand Down
3 changes: 2 additions & 1 deletion drivers/parisc/lasi.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ static void lasi_power_off(void)
int __init
lasi_init_chip(struct parisc_device *dev)
{
extern void (*chassis_power_off)(void);
struct gsc_asic *lasi;
struct gsc_irq gsc_irq;
int ret;
Expand Down Expand Up @@ -222,7 +223,7 @@ lasi_init_chip(struct parisc_device *dev)
* ensure that only the first LASI (the one controlling the power off)
* should set the HPA here */
lasi_power_off_hpa = lasi->hpa;
pm_power_off = lasi_power_off;
chassis_power_off = lasi_power_off;

return ret;
}
Expand Down

0 comments on commit 85509c0

Please sign in to comment.