linux-mips
[Top] [All Lists]

[PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface i

To: <ralf@linux-mips.org>, <linux-mips@linux-mips.org>
Subject: [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX
From: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Date: Thu, 16 Jan 2014 13:36:52 -0800
Cc: <Steven.Hill@imgtec.com>, <dengcheng.zhu@imgtec.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
From: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>

The commit 35a2af94c7 (sched/wait: Make the __wait_event*() interface more
friendly) changed __wait_event_interruptible() to use 2 parameters instead
of 3. It also made corresponding changes to rtlx.c. However, these changes
were partially reverted by 9d4147a783 (MIPS: APRP: Code formatting
clean-ups.). This patch fixes it.

Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
---
Ralf, this needs to go upstream-sfr/mips-for-linux-next to fix the APRP
build error: macro "__wait_event_interruptible" passed 3 arguments, but
takes just 2

 arch/mips/kernel/rtlx.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 4658350..31b1b76 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -108,10 +108,9 @@ int rtlx_open(int index, int can_sleep)
                p = vpe_get_shared(aprp_cpu_index());
                if (p == NULL) {
                        if (can_sleep) {
-                               __wait_event_interruptible(
+                               ret = __wait_event_interruptible(
                                        channel_wqs[index].lx_queue,
-                                       (p = vpe_get_shared(aprp_cpu_index())),
-                                       ret);
+                                       (p = vpe_get_shared(aprp_cpu_index())));
                                if (ret)
                                        goto out_fail;
                        } else {
-- 
1.8.5.3



<Prev in Thread] Current Thread [Next in Thread>