diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-01-23 12:47:34 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-01-24 14:40:25 +0100 |
commit | de89750c56f4bf2f04492c6ce298911381a7597a (patch) | |
tree | 5bb0b4ed731585aec488a7c9ab581bd8ab4a759f | |
parent | d8002539ec7b8bc793a212b79db4a796ce9bce9c (diff) | |
download | linux-de89750c56f4bf2f04492c6ce298911381a7597a.tar.bz2 |
ALSA: pcm: Drop unused snd_pcm_substream.file field
It's assigned but nowhere used. Let's remove it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | include/sound/pcm.h | 1 | ||||
-rw-r--r-- | sound/core/oss/pcm_oss.c | 1 | ||||
-rw-r--r-- | sound/core/pcm_native.c | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 2c30c1ad1b0d..a20d3a48df00 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -470,7 +470,6 @@ struct snd_pcm_substream { struct snd_pcm_group self_group; /* fake group for non linked substream (with substream lock inside) */ struct snd_pcm_group *group; /* pointer to current group */ /* -- assigned files -- */ - void *file; int ref_count; atomic_t mmap_count; unsigned int f_flags; diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 467039b342b5..d5b0d7ba83c4 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2427,7 +2427,6 @@ static int snd_pcm_oss_open_file(struct file *file, } pcm_oss_file->streams[idx] = substream; - substream->file = pcm_oss_file; snd_pcm_oss_init_substream(substream, &setup[idx], minor); } diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 26afb6b0889a..63640d3af9db 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2452,10 +2452,8 @@ static int snd_pcm_open_file(struct file *file, return -ENOMEM; } pcm_file->substream = substream; - if (substream->ref_count == 1) { - substream->file = pcm_file; + if (substream->ref_count == 1) substream->pcm_release = pcm_release_private; - } file->private_data = pcm_file; return 0; |