hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Sakamoto 2019-06-11 22:21:18 +09:00 committed by Takashi Iwai
parent d5553026b5
commit 4dbf4f44cf
1 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sound/firewire/dice/dice-pcm.c
View File

@ -231,30 +231,7 @@ static int pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int 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_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 playback_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
struct snd_dice *dice = substream->private_data; struct snd_dice *dice = substream->private_data;
@ -278,24 +255,7 @@ static int playback_hw_params(struct snd_pcm_substream *substream,
return err; return err;
} }
static int capture_hw_free(struct snd_pcm_substream *substream) static int pcm_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)
{ {
struct snd_dice *dice = substream->private_data; struct snd_dice *dice = substream->private_data;
@ -415,8 +375,8 @@ int snd_dice_create_pcm(struct snd_dice *dice)
.open = pcm_open, .open = pcm_open,
.close = pcm_close, .close = pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = capture_hw_params, .hw_params = pcm_hw_params,
.hw_free = capture_hw_free, .hw_free = pcm_hw_free,
.prepare = capture_prepare, .prepare = capture_prepare,
.trigger = capture_trigger, .trigger = capture_trigger,
.pointer = capture_pointer, .pointer = capture_pointer,
@ -427,8 +387,8 @@ int snd_dice_create_pcm(struct snd_dice *dice)
.open = pcm_open, .open = pcm_open,
.close = pcm_close, .close = pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = playback_hw_params, .hw_params = pcm_hw_params,
.hw_free = playback_hw_free, .hw_free = pcm_hw_free,
.prepare = playback_prepare, .prepare = playback_prepare,
.trigger = playback_trigger, .trigger = playback_trigger,
.pointer = playback_pointer, .pointer = playback_pointer,