diff options
| author | Pete Popov <ppopov@embeddedalley.com> | 2005-04-07 00:42:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:31:02 +0100 |
| commit | 494900af689a22479eb405ff1323cad673bd9208 (patch) | |
| tree | c4c50f2874f48679fd476a50e8866db2ce4696d3 /arch/mips/au1000 | |
| parent | 3b495f2bb749b828499135743b9ddec46e34fda8 (diff) | |
| download | linux-494900af689a22479eb405ff1323cad673bd9208.tar.gz linux-494900af689a22479eb405ff1323cad673bd9208.tar.bz2 linux-494900af689a22479eb405ff1323cad673bd9208.zip | |
Remove CONFIG_PM dependency from au1x wait in cpu_probe.
Additional work necessary to completely remove that config option.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000')
| -rw-r--r-- | arch/mips/au1000/common/power.c | 3 | ||||
| -rw-r--r-- | arch/mips/au1000/common/time.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index c40daccbb5b1..d3aa067505b4 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c @@ -297,7 +297,6 @@ static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, void *buffer, size_t * len) { int retval = 0; - void au1k_wait(void); if (!write) { *len = 0; @@ -306,7 +305,7 @@ static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, if (retval) return retval; suspend_mode = 1; - au1k_wait(); + retval = pm_send_all(PM_RESUME, (void *) 0); } return retval; diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index 90a0755c832b..2bc33824807b 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -57,7 +57,7 @@ unsigned long missed_heart_beats = 0; static unsigned long r4k_offset; /* Amount to increment compare reg each time */ static unsigned long r4k_cur; /* What counter should be at next timer irq */ int no_au1xxx_32khz; -void (*au1k_wait_ptr)(void); +int allow_au1k_wait = 0; /* default off for CP0 Counter */ /* Cycle counter value at the previous timer interrupt.. */ static unsigned int timerhi = 0, timerlo = 0; @@ -387,7 +387,6 @@ void au1xxx_timer_setup(struct irqaction *irq) { unsigned int est_freq; extern unsigned long (*do_gettimeoffset)(void); - extern void au1k_wait(void); printk("calculating r4koff... "); r4k_offset = cal_r4koff(); @@ -451,7 +450,7 @@ void au1xxx_timer_setup(struct irqaction *irq) /* We can use the real 'wait' instruction. */ - au1k_wait_ptr = au1k_wait; + allow_au1k_wait = 1; } #else |