| Message ID | 20190129175909.17423-3-perex@perex.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: pcm: implement the anonymous dup | expand |
On Tue, 29 Jan 2019 18:59:08 +0100, Jaroslav Kysela wrote: > > This member is no longer used. > > Signed-off-by: Jaroslav Kysela <perex@perex.cz> Heh, the very same change is already in my for-next branch :) thanks, Takashi
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index e7deb03b6702..61e4c69e73c7 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 b3738c228f39..222ddf9e4859 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 a6d2a5024ab5..3ab6fbd7acae 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2455,10 +2455,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;
This member is no longer used. Signed-off-by: Jaroslav Kysela <perex@perex.cz> --- include/sound/pcm.h | 1 - sound/core/oss/pcm_oss.c | 1 - sound/core/pcm_native.c | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-)