[MIPS] Alchemy: Reformat PM code.

[linux-3.10.git] / arch / mips / au1000 / common / power.c

diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 7504a63646161f81ec3d9176be903d8955c5da57..54047d69b820c98195dfa534748019414d8e76ea 100644 (file)
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -62,12 +62,6 @@ extern unsigned long save_local_and_disable(int controller);
 extern void restore_local_and_enable(int controller, unsigned long mask);
 extern void local_enable_irq(unsigned int irq_nr);
 
-/* Quick acpi hack. This will have to change! */
-#define        CTL_ACPI 9999
-#define        ACPI_S1_SLP_TYP 19
-#define        ACPI_SLEEP 21
-
-
 static DEFINE_SPINLOCK(pm_lock);
 
 /* We need to save/restore a bunch of core registers that are
@@ -217,7 +211,7 @@ int au_sleep(void)
        unsigned long wakeup, flags;
        extern  void    save_and_sleep(void);
 
-       spin_lock_irqsave(&pm_lock,flags);
+       spin_lock_irqsave(&pm_lock, flags);
 
        save_core_regs();
 
@@ -409,9 +403,9 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
        }
 
 
-       /* We don't want _any_ interrupts other than
-        * match20. Otherwise our au1000_calibrate_delay()
-        * calculation will be off, potentially a lot.
+       /*
+        * We don't want _any_ interrupts other than match20. Otherwise our
+        * au1000_calibrate_delay() calculation will be off, potentially a lot.
         */
        intc0_mask = save_local_and_disable(0);
        intc1_mask = save_local_and_disable(1);
@@ -420,20 +414,47 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
        au1000_calibrate_delay();
        restore_local_and_enable(0, intc0_mask);
        restore_local_and_enable(1, intc1_mask);
+
        return retval;
 }
 
 
 static struct ctl_table pm_table[] = {
-       {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
-       {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
-       {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
-       {0}
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "suspend",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0600,
+               .proc_handler   = &pm_do_suspend
+       },
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "sleep",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0600,
+               .proc_handler   = &pm_do_sleep
+       },
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "freq",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0600,
+               .proc_handler   = &pm_do_freq
+       },
+       {}
 };
 
 static struct ctl_table pm_dir_table[] = {
-       {CTL_ACPI, "pm", NULL, 0, 0555, pm_table},
-       {0}
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "pm",
+               .mode           = 0555,
+               .child          = pm_table
+       },
+       {}
 };
 
 /*
@@ -441,7 +462,7 @@ static struct ctl_table pm_dir_table[] = {
  */
 static int __init pm_init(void)
 {
-       register_sysctl_table(pm_dir_table, 1);
+       register_sysctl_table(pm_dir_table);
        return 0;
 }