ALSA: dice: code refactoring for pcm.hw_params/hw_free callbacks

The pairs of pcm.hw_params callbacks and .hw_free callbacks for both
direction have no differences.

This commit unifies the pairs.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/dice/dice-pcm.c b/sound/firewire/dice/dice-pcm.c
index 6c7a6b7ed743ab77073e11a990ee6bc05753b371..00b55dfc3b2c6127751bec69de748e64815853ea 100644 (file)
--- a/sound/firewire/dice/dice-pcm.c
+++ b/sound/firewire/dice/dice-pcm.c
@@ -231,8 +231,8 @@ static int pcm_close(struct snd_pcm_substream *substream)
        return 0;
 }
 
-static int capture_hw_params(struct snd_pcm_substream *substream,
-                            struct snd_pcm_hw_params *hw_params)
+static int pcm_hw_params(struct snd_pcm_substream *substream,
+                        struct snd_pcm_hw_params *hw_params)
 {
        struct snd_dice *dice = substream->private_data;
        int err;
@@ -254,48 +254,8 @@ static int capture_hw_params(struct snd_pcm_substream *substream,
 
        return err;
 }
-static int playback_hw_params(struct snd_pcm_substream *substream,
-                             struct snd_pcm_hw_params *hw_params)
-{
-       struct snd_dice *dice = substream->private_data;
-       int err;
-
-       err = snd_pcm_lib_alloc_vmalloc_buffer(substream,
-                                              params_buffer_bytes(hw_params));
-       if (err < 0)
-               return err;
-
-       if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
-               unsigned int rate = params_rate(hw_params);
-
-               mutex_lock(&dice->mutex);
-               err = snd_dice_stream_reserve_duplex(dice, rate);
-               if (err >= 0)
-                       ++dice->substreams_counter;
-               mutex_unlock(&dice->mutex);
-       }
-
-       return err;
-}
-
-static int capture_hw_free(struct snd_pcm_substream *substream)
-{
-       struct snd_dice *dice = substream->private_data;
-
-       mutex_lock(&dice->mutex);
-
-       if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
-               --dice->substreams_counter;
-
-       snd_dice_stream_stop_duplex(dice);
-       snd_dice_stream_release_duplex(dice);
-
-       mutex_unlock(&dice->mutex);
-
-       return snd_pcm_lib_free_vmalloc_buffer(substream);
-}
 
-static int playback_hw_free(struct snd_pcm_substream *substream)
+static int pcm_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_dice *dice = substream->private_data;
 
@@ -415,8 +375,8 @@ int snd_dice_create_pcm(struct snd_dice *dice)
                .open      = pcm_open,
                .close     = pcm_close,
                .ioctl     = snd_pcm_lib_ioctl,
-               .hw_params = capture_hw_params,
-               .hw_free   = capture_hw_free,
+               .hw_params = pcm_hw_params,
+               .hw_free   = pcm_hw_free,
                .prepare   = capture_prepare,
                .trigger   = capture_trigger,
                .pointer   = capture_pointer,
@@ -427,8 +387,8 @@ int snd_dice_create_pcm(struct snd_dice *dice)
                .open      = pcm_open,
                .close     = pcm_close,
                .ioctl     = snd_pcm_lib_ioctl,
-               .hw_params = playback_hw_params,
-               .hw_free   = playback_hw_free,
+               .hw_params = pcm_hw_params,
+               .hw_free   = pcm_hw_free,
                .prepare   = playback_prepare,
                .trigger   = playback_trigger,
                .pointer   = playback_pointer,