From: Jaroslav Kysela <perex@perex.cz>
To: ALSA development <alsa-devel@alsa-project.org>
Cc: Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>,
Baolin Wang <baolin.wang@linaro.org>,
Leo Yan <leo.yan@linaro.org>
Subject: [PATCH 2/3] ALSA: pcm: remove the file member from struct pcm
Date: Tue, 29 Jan 2019 18:59:08 +0100 [thread overview]
Message-ID: <20190129175909.17423-3-perex@perex.cz> (raw)
In-Reply-To: <20190129175909.17423-1-perex@perex.cz>
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(-)
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;
--
2.13.6
next prev parent reply other threads:[~2019-01-29 17:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 17:59 [PATCH 0/3] ALSA: pcm: implement the anonymous dup Jaroslav Kysela
2019-01-29 17:59 ` [PATCH 1/3] ALSA: pcm: implement the anonymous dup (inode file descriptor) Jaroslav Kysela
2019-01-29 18:44 ` Takashi Iwai
2019-01-30 8:07 ` Jaroslav Kysela
2019-01-29 17:59 ` Jaroslav Kysela [this message]
2019-01-29 18:45 ` [PATCH 2/3] ALSA: pcm: remove the file member from struct pcm Takashi Iwai
2019-01-29 17:59 ` [PATCH 3/3] ALSA: pcm: implement the ioctl/mmap filter for the anonymous dup Jaroslav Kysela
2019-01-29 18:47 ` Takashi Iwai
2019-01-29 19:48 ` [PATCH 0/3] ALSA: pcm: implement " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190129175909.17423-3-perex@perex.cz \
--to=perex@perex.cz \
--cc=alsa-devel@alsa-project.org \
--cc=baolin.wang@linaro.org \
--cc=broonie@kernel.org \
--cc=leo.yan@linaro.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).