* [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX
@ 2014-01-16 21:36 Deng-Cheng Zhu
2014-01-16 21:36 ` Deng-Cheng Zhu
2014-01-17 7:14 ` John Crispin
0 siblings, 2 replies; 4+ messages in thread
From: Deng-Cheng Zhu @ 2014-01-16 21:36 UTC (permalink / raw)
To: ralf, linux-mips; +Cc: Steven.Hill, dengcheng.zhu
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX
2014-01-16 21:36 [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX Deng-Cheng Zhu
@ 2014-01-16 21:36 ` Deng-Cheng Zhu
2014-01-17 7:14 ` John Crispin
1 sibling, 0 replies; 4+ messages in thread
From: Deng-Cheng Zhu @ 2014-01-16 21:36 UTC (permalink / raw)
To: ralf, linux-mips; +Cc: Steven.Hill, dengcheng.zhu
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX
2014-01-16 21:36 [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX Deng-Cheng Zhu
2014-01-16 21:36 ` Deng-Cheng Zhu
@ 2014-01-17 7:14 ` John Crispin
[not found] ` <52D968D1.2040309@imgtec.com>
1 sibling, 1 reply; 4+ messages in thread
From: John Crispin @ 2014-01-17 7:14 UTC (permalink / raw)
To: Deng-Cheng Zhu, linux-mips
Hi,
should we fold this fix into 9d4147a783
John
On 16/01/2014 22:36, Deng-Cheng Zhu wrote:
> 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 {
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-20 23:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-16 21:36 [PATCH upstream-sfr] MIPS: APRP: Use the new __wait_event*() interface in RTLX Deng-Cheng Zhu
2014-01-16 21:36 ` Deng-Cheng Zhu
2014-01-17 7:14 ` John Crispin
[not found] ` <52D968D1.2040309@imgtec.com>
2014-01-20 23:09 ` DengCheng Zhu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox