diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-05-29 17:11:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 17:26:32 +0200 |
| commit | 0cbf324e90ef0d03b79eade46123479849f6b02b (patch) | |
| tree | fde75fdfe13081a0a070e4b0a3543c7f9ee90c7e /sound | |
| parent | d0a601c278de6876f36bcf1b7a9678d93d7dc67b (diff) | |
| download | op-kernel-dev-0cbf324e90ef0d03b79eade46123479849f6b02b.zip op-kernel-dev-0cbf324e90ef0d03b79eade46123479849f6b02b.tar.gz | |
sound/oss: use schedule_timeout_interruptible()
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/msnd_pinnacle.c | 3 |
1 files changed, 1 insertions, 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"); |
