[PATCH] sound/oss: use schedule_timeout_interruptible()

[PATCH] sound/oss: use schedule_timeout_interruptible()

[Nicholas Mc Guire]

API consolidation with coccinelle found:
./sound/oss/msnd_pinnacle.c:1292:2-18:
        consolidation with schedule_timeout_*() recommended

This is a 1:1 conversion of the current calls to an available helper
only - so only an API consolidation to improve readability.

Patch was compile tested with x86_64_defconfig

Patch is against 4.1-rc5 (localversion-next is -next-20150529)

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
 sound/oss/msnd_pinnacle.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index a8ceef8..a8bb4a0 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -1288,8 +1288,7 @@ static int __init calibrate_adc(WORD srate)
 		       & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);
 	if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &&
 	    chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) {
-		__set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(HZ / 3);
+		schedule_timeout_interruptible(HZ / 3);
 		return 0;
 	}
 	printk(KERN_WARNING LOGNAME ": ADC calibration failed\n");
-- 
1.7.10.4

Re: [PATCH] sound/oss: use schedule_timeout_interruptible()

[Takashi Iwai]

At Fri, 29 May 2015 17:11:14 +0200,
Nicholas Mc Guire wrote:
> 
> API consolidation with coccinelle found:
> ./sound/oss/msnd_pinnacle.c:1292:2-18:
>         consolidation with schedule_timeout_*() recommended
> 
> This is a 1:1 conversion of the current calls to an available helper
> only - so only an API consolidation to improve readability.
> 
> Patch was compile tested with x86_64_defconfig
> 
> Patch is against 4.1-rc5 (localversion-next is -next-20150529)
> 
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>

Applied, thanks.


Takashi

> ---
>  sound/oss/msnd_pinnacle.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
> index a8ceef8..a8bb4a0 100644
> --- a/sound/oss/msnd_pinnacle.c
> +++ b/sound/oss/msnd_pinnacle.c
> @@ -1288,8 +1288,7 @@ static int __init calibrate_adc(WORD srate)
>  		       & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);
>  	if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &&
>  	    chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) {
> -		__set_current_state(TASK_INTERRUPTIBLE);
> -		schedule_timeout(HZ / 3);
> +		schedule_timeout_interruptible(HZ / 3);
>  		return 0;
>  	}
>  	printk(KERN_WARNING LOGNAME ": ADC calibration failed\n");
> -- 
> 1.7.10.4
>