aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-04-06 20:42:10 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:02 -0400
commit494900af689a22479eb405ff1323cad673bd9208 (patch)
treec4c50f2874f48679fd476a50e8866db2ce4696d3 /arch/mips/au1000
parent3b495f2bb749b828499135743b9ddec46e34fda8 (diff)
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.c3
-rw-r--r--arch/mips/au1000/common/time.c5
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,
297 void *buffer, size_t * len) 297 void *buffer, size_t * len)
298{ 298{
299 int retval = 0; 299 int retval = 0;
300 void au1k_wait(void);
301 300
302 if (!write) { 301 if (!write) {
303 *len = 0; 302 *len = 0;
@@ -306,7 +305,7 @@ static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
306 if (retval) 305 if (retval)
307 return retval; 306 return retval;
308 suspend_mode = 1; 307 suspend_mode = 1;
309 au1k_wait(); 308
310 retval = pm_send_all(PM_RESUME, (void *) 0); 309 retval = pm_send_all(PM_RESUME, (void *) 0);
311 } 310 }
312 return retval; 311 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;
57static unsigned long r4k_offset; /* Amount to increment compare reg each time */ 57static unsigned long r4k_offset; /* Amount to increment compare reg each time */
58static unsigned long r4k_cur; /* What counter should be at next timer irq */ 58static unsigned long r4k_cur; /* What counter should be at next timer irq */
59int no_au1xxx_32khz; 59int no_au1xxx_32khz;
60void (*au1k_wait_ptr)(void); 60int allow_au1k_wait = 0; /* default off for CP0 Counter */
61 61
62/* Cycle counter value at the previous timer interrupt.. */ 62/* Cycle counter value at the previous timer interrupt.. */
63static unsigned int timerhi = 0, timerlo = 0; 63static unsigned int timerhi = 0, timerlo = 0;
@@ -387,7 +387,6 @@ void au1xxx_timer_setup(struct irqaction *irq)
387{ 387{
388 unsigned int est_freq; 388 unsigned int est_freq;
389 extern unsigned long (*do_gettimeoffset)(void); 389 extern unsigned long (*do_gettimeoffset)(void);
390 extern void au1k_wait(void);
391 390
392 printk("calculating r4koff... "); 391 printk("calculating r4koff... ");
393 r4k_offset = cal_r4koff(); 392 r4k_offset = cal_r4koff();
@@ -451,7 +450,7 @@ void au1xxx_timer_setup(struct irqaction *irq)
451 450
452 /* We can use the real 'wait' instruction. 451 /* We can use the real 'wait' instruction.
453 */ 452 */
454 au1k_wait_ptr = au1k_wait; 453 allow_au1k_wait = 1;
455 } 454 }
456 455
457#else 456#else