UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: firewire-digi00x: 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>
This commit is contained in:
Takashi Sakamoto 2019-06-11 22:21:13 +09:00 committed by Takashi Iwai
parent 24bb77b3ff
commit 478f3a56dc
1 changed files with 7 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sound/firewire/digi00x/digi00x-pcm.c
View File

@ -155,7 +155,7 @@ static int pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int pcm_capture_hw_params(struct snd_pcm_substream *substream, static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
struct snd_dg00x *dg00x = substream->private_data; struct snd_dg00x *dg00x = substream->private_data;
@ -179,48 +179,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
return err; return err;
} }
static int pcm_playback_hw_params(struct snd_pcm_substream *substream, static int pcm_hw_free(struct snd_pcm_substream *substream)
struct snd_pcm_hw_params *hw_params)
{
struct snd_dg00x *dg00x = 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(&dg00x->mutex);
err = snd_dg00x_stream_reserve_duplex(dg00x, rate);
if (err >= 0)
++dg00x->substreams_counter;
mutex_unlock(&dg00x->mutex);
}
return err;
}
static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
{
struct snd_dg00x *dg00x = substream->private_data;
mutex_lock(&dg00x->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
--dg00x->substreams_counter;
snd_dg00x_stream_stop_duplex(dg00x);
snd_dg00x_stream_release_duplex(dg00x);
mutex_unlock(&dg00x->mutex);
return snd_pcm_lib_free_vmalloc_buffer(substream);
}
static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_dg00x *dg00x = substream->private_data; struct snd_dg00x *dg00x = substream->private_data;
@ -341,8 +300,8 @@ int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)
.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,
@ -353,8 +312,8 @@ int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)
.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,