From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: tiwai@suse.de
Cc: alsa-devel@alsa-project.org
Subject: [PATCH alsa-lib v2 6/6] pcm: hw: remove superfluous code to call of SNDRV_PCM_IOCTL_SYNC_PTR in snd_pcm_hw_forward()
Date: Fri, 30 Jun 2017 20:37:29 +0900 [thread overview]
Message-ID: <20170630113729.13656-7-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <20170630113729.13656-1-o-takashi@sakamocchi.jp>
SNDRV_PCM_IOCTL_SYNC_PTR command was introduced to PCM protocol/interface
in its version 2.0.7, however this command is used in a branch for the
newer version protocol/interface in snd_pcm_hw_forward().
This commit removes the superfluous code as a part of work for code
refactoring.
Fixes: eafb4925124b ("- added SYNC_PTR ioctl support for pcm_hw plugin")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
src/pcm/pcm_hw.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 9c8fc3f6..16d45e74 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -144,13 +144,6 @@ static int sync_ptr1(snd_pcm_hw_t *hw, unsigned int flags)
return 0;
}
-static int sync_ptr(snd_pcm_hw_t *hw, unsigned int flags)
-{
- if (hw->mmap_status_fallbacked || hw->mmap_control_fallbacked)
- return sync_ptr1(hw, flags);
- return 0;
-}
-
static int issue_avail_min(snd_pcm_hw_t *hw)
{
if (!hw->mmap_control_fallbacked)
@@ -777,9 +770,6 @@ static snd_pcm_sframes_t snd_pcm_hw_forward(snd_pcm_t *pcm, snd_pcm_uframes_t fr
} else {
snd_pcm_sframes_t avail;
- err = sync_ptr(hw, SNDRV_PCM_SYNC_PTR_HWSYNC);
- if (err < 0)
- return err;
switch (FAST_PCM_STATE(hw)) {
case SNDRV_PCM_STATE_RUNNING:
case SNDRV_PCM_STATE_DRAINING:
@@ -797,9 +787,6 @@ static snd_pcm_sframes_t snd_pcm_hw_forward(snd_pcm_t *pcm, snd_pcm_uframes_t fr
if (frames > (snd_pcm_uframes_t)avail)
frames = avail;
snd_pcm_mmap_appl_forward(pcm, frames);
- err = sync_ptr(hw, 0);
- if (err < 0)
- return err;
return frames;
}
}
--
2.11.0
next prev parent reply other threads:[~2017-06-30 11:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 11:37 [PATCH alsa-lib v2 0/6] pcm: hw: optimization for v2.0.14 of PCM protocol/interface Takashi Sakamoto
2017-06-30 11:37 ` [PATCH alsa-lib v2 1/6] pcm: hw: add a helper function to query status/control data Takashi Sakamoto
2017-06-30 11:37 ` [PATCH alsa-lib v2 2/6] pcm: hw: add a helper function just to query status data Takashi Sakamoto
2017-06-30 11:37 ` [PATCH alsa-lib v2 3/6] pcm: hw: add a helper function to request hwsync without side-effects Takashi Sakamoto
2017-06-30 11:37 ` [PATCH alsa-lib v2 4/6] pcm: hw: add a helper function to issue appl_ptr " Takashi Sakamoto
2017-06-30 11:37 ` [PATCH alsa-lib v2 5/6] pcm: hw: add a helper function to issue avail_min " Takashi Sakamoto
2017-06-30 11:37 ` Takashi Sakamoto [this message]
2017-06-30 14:43 ` [PATCH alsa-lib v2 0/6] pcm: hw: optimization for v2.0.14 of PCM protocol/interface Takashi Iwai
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=20170630113729.13656-7-o-takashi@sakamocchi.jp \
--to=o-takashi@sakamocchi.jp \
--cc=alsa-devel@alsa-project.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.