Appease nxstyle complaints

This commit is contained in:
YAMAMOTO Takashi 2020-04-01 00:28:08 +09:00 committed by Xiang Xiao
parent 4ddb457c3e
commit c009927deb
3 changed files with 11 additions and 10 deletions

View File

@ -289,7 +289,7 @@ int up_cpu_pause(int cpu)
* called. g_cpu_paused will be unlocked in any case.
*/
return ret;
return ret;
}
/****************************************************************************

View File

@ -86,7 +86,6 @@
volatile spinlock_t g_cpu_wait[CONFIG_SMP_NCPUS];
volatile spinlock_t g_cpu_paused[CONFIG_SMP_NCPUS];
/****************************************************************************
* Public Functions
****************************************************************************/
@ -302,7 +301,7 @@ int up_cpu_pause(int cpu)
* called. g_cpu_paused will be unlocked in any case.
*/
return 0;
return 0;
}
/****************************************************************************

View File

@ -208,6 +208,7 @@ int arm_pause_handler(int irq, void *c, FAR void *arg)
int cpu = up_cpu_index();
/* Clear : Pause IRQ */
/* IPC Interrupt Clear Command Register (write-only) */
if (1 == cpu)
@ -256,7 +257,7 @@ int arm_pause_handler(int irq, void *c, FAR void *arg)
int up_cpu_pause(int cpu)
{
DPRINTF("cpu=%d\n",cpu);
DPRINTF("cpu=%d\n", cpu);
DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS && cpu != this_cpu());
@ -266,10 +267,10 @@ int up_cpu_pause(int cpu)
sched_note_cpu_pause(this_task(), cpu);
#endif
/* Take the both spinlocks. The g_cpu_wait spinlock will prevent the interrupt
* handler from returning until up_cpu_resume() is called; g_cpu_paused
* is a handshake that will prefent this function from returning until
* the CPU is actually paused.
/* Take the both spinlocks. The g_cpu_wait spinlock will prevent the
* interrupt handler from returning until up_cpu_resume() is called;
* g_cpu_paused is a handshake that will prefent this function from
* returning until the CPU is actually paused.
*/
DEBUGASSERT(!spin_islocked(&g_cpu_wait[cpu]) &&
@ -279,6 +280,7 @@ int up_cpu_pause(int cpu)
spin_lock(&g_cpu_paused[cpu]);
/* Execute Pause IRQ to CPU(cpu) */
/* Set IPC Interrupt (IRQ0) (write-only) */
if (cpu == 1)
@ -302,7 +304,7 @@ int up_cpu_pause(int cpu)
* called. g_cpu_paused will be unlocked in any case.
*/
return OK;
return OK;
}
/****************************************************************************
@ -326,7 +328,7 @@ int up_cpu_pause(int cpu)
int up_cpu_resume(int cpu)
{
DPRINTF("cpu=%d\n",cpu);
DPRINTF("cpu=%d\n", cpu);
DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS && cpu != this_cpu());