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 c8fef64d..a849c644 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) @@ -763,9 +756,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: @@ -783,9 +773,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; } }