lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: pcm - remove the dead code from snd_pcm_open_file()

Browse Source 
The rpcm_file parameter is never used in current ALSA code, so remove
it to make it cleaner.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Feng Tang
2011-10-10 10:31:48 +08:00
committed by Takashi Iwai
parent 8d448162bd
commit ffd3d5c6c7
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/core/pcm_native.c
View File

@@ -2058,16 +2058,12 @@ EXPORT_SYMBOL(snd_pcm_open_substream);
static int snd_pcm_open_file(struct file *file, static int snd_pcm_open_file(struct file *file,
struct snd_pcm *pcm, struct snd_pcm *pcm,
int stream, int stream)
struct snd_pcm_file **rpcm_file)
{ {
struct snd_pcm_file *pcm_file; struct snd_pcm_file *pcm_file;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
int err; int err;
if (rpcm_file)
*rpcm_file = NULL;
err = snd_pcm_open_substream(pcm, stream, file, &substream); err = snd_pcm_open_substream(pcm, stream, file, &substream);
if (err < 0) if (err < 0)
return err; return err;
@@ -2083,8 +2079,7 @@ static int snd_pcm_open_file(struct file *file,
substream->pcm_release = pcm_release_private; substream->pcm_release = pcm_release_private;
} }
file->private_data = pcm_file; file->private_data = pcm_file;
if (rpcm_file)
*rpcm_file = pcm_file;
return 0; return 0;
} }
@@ -2113,7 +2108,6 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)
static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream) static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
{ {
int err; int err;
struct snd_pcm_file *pcm_file;
wait_queue_t wait; wait_queue_t wait;
if (pcm == NULL) { if (pcm == NULL) {
@@ -2131,7 +2125,7 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
add_wait_queue(&pcm->open_wait, &wait); add_wait_queue(&pcm->open_wait, &wait);
mutex_lock(&pcm->open_mutex); mutex_lock(&pcm->open_mutex);
while (1) { while (1) {
err = snd_pcm_open_file(file, pcm, stream, &pcm_file); err = snd_pcm_open_file(file, pcm, stream);
if (err >= 0) if (err >= 0)
break; break;
if (err == -EAGAIN) { if (err == -EAGAIN) {