isdn/capi: replace interruptible_sleep_on() with wait_event_interruptible()
PATCH 2/8 isdn/capi: replace interruptible_sleep_on() with wait_event_interruptible()
Use wait_event_interruptible() instead of the deprecated interruptible_sleep_on(). Patch is straight-forward as current sleep is conditionally looped. Patch is compile-tested.
---
kj-domen/drivers/isdn/capi/capi.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
drivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi +2 -7
@@ -675,13 +675,8 @@ capi_read(struct file *file, char __userif (file->f_flags &O_NONBLOCK )return -EAGAIN ; -for (;;) { -interruptible_sleep_on (&cdev->recvwait); -if ((skb =skb_dequeue (&cdev->recvqueue)) !=0 ) -break ; -if (signal_pending (current)) -break ; - } +wait_event_interruptible (cdev->recvwait, + ((skb =skb_dequeue (&cdev->recvqueue)) ==0 ));if (skb ==0 )return -ERESTARTNOHAND ; }
_
Quoted 24 lines · [email protected] wrote:
Use
wait_event_interruptible()instead of the deprecatedinterruptible_sleep_on(). Patch is straight-forward as current sleep is conditionally looped. Patch is compile-tested.Signed-off-by Nishanth Aravamudan <[email protected]>Signed-off-by Domen Puncer <[email protected]>---
kj-domen/drivers/isdn/capi/capi.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)diff -puN
drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capidrivers/isdn/capi/capi.cdrivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi +0
-2@@ -675,13 +675,8 @@ capi_read(struct file *file, char __userif (file->f_flags &O_NONBLOCK )return -EAGAIN ; -for (;;) { -interruptible_sleep_on (&cdev->recvwait);
drivers/isdn/capi/capi.c capi_read(struct file *file, char __user · line 682
Quoted 10 lines
drivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi +2
-5-if ((skb =skb_dequeue (&cdev->recvqueue)) !=0 ) -break ; -if (signal_pending (current)) -break ; - } +wait_event_interruptible (cdev->recvwait, + ((skb =skb_dequeue (&cdev->recvqueue)) ==0 ));if (skb ==0 )return -ERESTARTNOHAND ; }
hmm, OK. Putting an expression with side-effect such as this into a macro which evaluates the expression multiple times is a bit of a worry, but it appears that everything will work OK.
That being said, I'd prefer that this come in via the ISDN team, after having been tested please.
Quoted 40 lines · Andrew Morton
Quoted 24 lines · [email protected] wrote:
Use
wait_event_interruptible()instead of the deprecatedinterruptible_sleep_on(). Patch is straight-forward as current sleep is conditionally looped. Patch is compile-tested.Signed-off-by Nishanth Aravamudan <[email protected]>Signed-off-by Domen Puncer <[email protected]>---
kj-domen/drivers/isdn/capi/capi.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)diff -puN
drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capidrivers/isdn/capi/capi.cdrivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi +0
-2@@ -675,13 +675,8 @@ capi_read(struct file *file, char __userif (file->f_flags &O_NONBLOCK )return -EAGAIN ; -for (;;) { -interruptible_sleep_on (&cdev->recvwait);drivers/isdn/capi/capi.c capi_read(struct file *file, char __user · line 682
Quoted 10 lines
drivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi +2
-5-if ((skb =skb_dequeue (&cdev->recvqueue)) !=0 ) -break ; -if (signal_pending (current)) -break ; - } +wait_event_interruptible (cdev->recvwait, + ((skb =skb_dequeue (&cdev->recvqueue)) ==0 ));if (skb ==0 )return -ERESTARTNOHAND ; }hmm, OK. Putting an expression with side-effect such as this into a macro which evaluates the expression multiple times is a bit of a worry, but it appears that everything will work OK.
Quoted 2 lines
That being said, I'd prefer that this come in via the ISDN team, after having been tested please.
I believe last update from ISDN team was 13 months ago. :-( And I concur, testing would be great.
Domen