Commit f69fc179 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: bebob: code rafactoring for callback functions to PCM interface

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

This commit unifies the pairs.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9aa892d2
...@@ -185,33 +185,8 @@ pcm_close(struct snd_pcm_substream *substream) ...@@ -185,33 +185,8 @@ pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int static int pcm_hw_params(struct snd_pcm_substream *substream,
pcm_capture_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params)
struct snd_pcm_hw_params *hw_params)
{
struct snd_bebob *bebob = 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(&bebob->mutex);
err = snd_bebob_stream_reserve_duplex(bebob, rate);
if (err >= 0)
++bebob->substreams_counter;
mutex_unlock(&bebob->mutex);
}
return err;
}
static int
pcm_playback_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{ {
struct snd_bebob *bebob = substream->private_data; struct snd_bebob *bebob = substream->private_data;
int err; int err;
...@@ -234,23 +209,7 @@ pcm_playback_hw_params(struct snd_pcm_substream *substream, ...@@ -234,23 +209,7 @@ pcm_playback_hw_params(struct snd_pcm_substream *substream,
return err; return err;
} }
static int static int pcm_hw_free(struct snd_pcm_substream *substream)
pcm_capture_hw_free(struct snd_pcm_substream *substream)
{
struct snd_bebob *bebob = substream->private_data;
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) {
mutex_lock(&bebob->mutex);
bebob->substreams_counter--;
mutex_unlock(&bebob->mutex);
}
snd_bebob_stream_stop_duplex(bebob);
return snd_pcm_lib_free_vmalloc_buffer(substream);
}
static int
pcm_playback_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_bebob *bebob = substream->private_data; struct snd_bebob *bebob = substream->private_data;
...@@ -360,8 +319,8 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob) ...@@ -360,8 +319,8 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
.open = pcm_open, .open = pcm_open,
.close = pcm_close, .close = pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = pcm_capture_hw_params, .hw_params = pcm_hw_params,
.hw_free = pcm_capture_hw_free, .hw_free = pcm_hw_free,
.prepare = pcm_capture_prepare, .prepare = pcm_capture_prepare,
.trigger = pcm_capture_trigger, .trigger = pcm_capture_trigger,
.pointer = pcm_capture_pointer, .pointer = pcm_capture_pointer,
...@@ -372,8 +331,8 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob) ...@@ -372,8 +331,8 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
.open = pcm_open, .open = pcm_open,
.close = pcm_close, .close = pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = pcm_playback_hw_params, .hw_params = pcm_hw_params,
.hw_free = pcm_playback_hw_free, .hw_free = pcm_hw_free,
.prepare = pcm_playback_prepare, .prepare = pcm_playback_prepare,
.trigger = pcm_playback_trigger, .trigger = pcm_playback_trigger,
.pointer = pcm_playback_pointer, .pointer = pcm_playback_pointer,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment