[ALSA] Remove spinlocks around proc prints
Don't lock during showing proc read. snd_iprintf() might sleep. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
bf850204a7
commit
d689e34b52
|
@ -351,10 +351,8 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,
|
|||
snd_iprintf(buffer, "closed\n");
|
||||
return;
|
||||
}
|
||||
snd_pcm_stream_lock_irq(substream);
|
||||
if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
|
||||
snd_iprintf(buffer, "no setup\n");
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
return;
|
||||
}
|
||||
snd_iprintf(buffer, "access: %s\n", snd_pcm_access_name(runtime->access));
|
||||
|
@ -375,7 +373,6 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,
|
|||
snd_iprintf(buffer, "OSS period frames: %lu\n", (unsigned long)runtime->oss.period_frames);
|
||||
}
|
||||
#endif
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
}
|
||||
|
||||
static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,
|
||||
|
@ -387,10 +384,8 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,
|
|||
snd_iprintf(buffer, "closed\n");
|
||||
return;
|
||||
}
|
||||
snd_pcm_stream_lock_irq(substream);
|
||||
if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
|
||||
snd_iprintf(buffer, "no setup\n");
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
return;
|
||||
}
|
||||
snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime->tstamp_mode));
|
||||
|
@ -403,7 +398,6 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,
|
|||
snd_iprintf(buffer, "silence_threshold: %lu\n", runtime->silence_threshold);
|
||||
snd_iprintf(buffer, "silence_size: %lu\n", runtime->silence_size);
|
||||
snd_iprintf(buffer, "boundary: %lu\n", runtime->boundary);
|
||||
snd_pcm_stream_unlock_irq(substream);
|
||||
}
|
||||
|
||||
static void snd_pcm_substream_proc_status_read(struct snd_info_entry *entry,
|
||||
|
|
|
@ -1095,7 +1095,6 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,
|
|||
if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
|
||||
snd_iprintf(buffer, " SLAVE");
|
||||
snd_iprintf(buffer, "\n");
|
||||
spin_lock_irqsave(&timer->lock, flags);
|
||||
list_for_each(q, &timer->open_list_head) {
|
||||
ti = list_entry(q, struct snd_timer_instance, open_list);
|
||||
snd_iprintf(buffer, " Client %s : %s\n",
|
||||
|
@ -1104,7 +1103,6 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,
|
|||
SNDRV_TIMER_IFLG_RUNNING)
|
||||
? "running" : "stopped");
|
||||
}
|
||||
spin_unlock_irqrestore(&timer->lock, flags);
|
||||
}
|
||||
mutex_unlock(®ister_mutex);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue