1 files changed, 16 insertions, 25 deletions

diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c
index 9e27eb8e1dd4..e6adab3ef42e 100644
--- a/sound/firewire/bebob/bebob_pcm.c
+++ b/sound/firewire/bebob/bebob_pcm.c
@@ -92,19 +92,6 @@ limit_channels_and_rates(struct snd_pcm_hardware *hw,
         }
 }
 
-static void
-limit_period_and_buffer(struct snd_pcm_hardware *hw)
-{
-        hw->periods_min = 2;            /* SNDRV_PCM_INFO_BATCH */
-        hw->periods_max = UINT_MAX;
-
-        hw->period_bytes_min = 4 * hw->channels_max;    /* bytes for a frame */
-
-        /* Just to prevent from allocating much pages. */
-        hw->period_bytes_max = hw->period_bytes_min * 2048;
-        hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;
-}
-
 static int
 pcm_init_hw_params(struct snd_bebob *bebob,
                    struct snd_pcm_substream *substream)
@@ -114,13 +101,6 @@ pcm_init_hw_params(struct snd_bebob *bebob,
         struct snd_bebob_stream_formation *formations;
         int err;
 
-        runtime->hw.info = SNDRV_PCM_INFO_BATCH |
-                           SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                           SNDRV_PCM_INFO_INTERLEAVED |
-                           SNDRV_PCM_INFO_JOINT_DUPLEX |
-                           SNDRV_PCM_INFO_MMAP |
-                           SNDRV_PCM_INFO_MMAP_VALID;
-
         if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
                 runtime->hw.formats = AM824_IN_PCM_FORMAT_BITS;
                 s = &bebob->tx_stream;
@@ -132,7 +112,6 @@ pcm_init_hw_params(struct snd_bebob *bebob,
         }
 
         limit_channels_and_rates(&runtime->hw, formations);
-        limit_period_and_buffer(&runtime->hw);
 
         err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
                                   hw_rule_channels, formations,
@@ -224,8 +203,6 @@ pcm_capture_hw_params(struct snd_pcm_substream *substream,
                 mutex_unlock(&bebob->mutex);
         }
 
-        amdtp_am824_set_pcm_format(&bebob->tx_stream, params_format(hw_params));
-
         return 0;
 }
 static int
@@ -246,8 +223,6 @@ pcm_playback_hw_params(struct snd_pcm_substream *substream,
                 mutex_unlock(&bebob->mutex);
         }
 
-        amdtp_am824_set_pcm_format(&bebob->rx_stream, params_format(hw_params));
-
         return 0;
 }
 
@@ -359,6 +334,20 @@ pcm_playback_pointer(struct snd_pcm_substream *sbstrm)
         return amdtp_stream_pcm_pointer(&bebob->rx_stream);
 }
 
+static int pcm_capture_ack(struct snd_pcm_substream *substream)
+{
+        struct snd_bebob *bebob = substream->private_data;
+
+        return amdtp_stream_pcm_ack(&bebob->tx_stream);
+}
+
+static int pcm_playback_ack(struct snd_pcm_substream *substream)
+{
+        struct snd_bebob *bebob = substream->private_data;
+
+        return amdtp_stream_pcm_ack(&bebob->rx_stream);
+}
+
 int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
 {
         static const struct snd_pcm_ops capture_ops = {
@@ -370,6 +359,7 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
                 .prepare        = pcm_capture_prepare,
                 .trigger        = pcm_capture_trigger,
                 .pointer        = pcm_capture_pointer,
+                .ack            = pcm_capture_ack,
                 .page           = snd_pcm_lib_get_vmalloc_page,
         };
         static const struct snd_pcm_ops playback_ops = {
@@ -381,6 +371,7 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
                 .prepare        = pcm_playback_prepare,
                 .trigger        = pcm_playback_trigger,
                 .pointer        = pcm_playback_pointer,
+                .ack            = pcm_playback_ack,
                 .page           = snd_pcm_lib_get_vmalloc_page,
                 .mmap           = snd_pcm_lib_mmap_vmalloc,
         };