OSDN Git Service

powerpc/64s: Drop no longer used IDLE_STATE_ENTER_SEQ
authorNicholas Piggin <npiggin@gmail.com>
Tue, 29 Aug 2017 11:40:35 +0000 (21:40 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 29 Aug 2017 11:41:44 +0000 (21:41 +1000)
There are no longer any callers of IDLE_STATE_ENTER_SEQ, all callers
use IDLE_STATE_ENTER_SEQ_NORET. So drop the former.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
[mpe: Split out of larger patch, write change log]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/idle_book3s.S

index 22e616e..596b6ba 100644 (file)
@@ -209,7 +209,7 @@ pnv_powersave_common:
  * This is the sequence required to execute idle instructions, as
  * specified in ISA v2.07 (and earlier). MSR[IR] and MSR[DR] must be 0.
  */
-#define IDLE_STATE_ENTER_SEQ(IDLE_INST)                                \
+#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)                  \
        /* Magic NAP/SLEEP/WINKLE mode enter sequence */        \
        std     r0,0(r1);                                       \
        ptesync;                                                \
@@ -218,9 +218,6 @@ pnv_powersave_common:
        bne     236b;                                           \
        IDLE_INST;
 
-#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)                  \
-       IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \
-       b       .
 
        .globl pnv_enter_arch207_idle_mode
 pnv_enter_arch207_idle_mode: