Commit 49f621fe authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: fireface: 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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f55e2a89

sound/firewire/fireface/ff-pcm.c

+7 −48
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int pcm_close(struct snd_pcm_substream *substream) 
	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_ff *ff = substream->private_data;
@@ -223,48 +223,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int pcm_playback_hw_params(struct snd_pcm_substream *substream,

				  struct snd_pcm_hw_params *hw_params)

{

	struct snd_ff *ff = 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(&ff->mutex);

		err = snd_ff_stream_reserve_duplex(ff, rate);

		if (err >= 0)

			++ff->substreams_counter;

		mutex_unlock(&ff->mutex);

	}



	return 0;

}



static int pcm_capture_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_ff *ff = substream->private_data;



	mutex_lock(&ff->mutex);



	if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)

		--ff->substreams_counter;



	snd_ff_stream_stop_duplex(ff);

	snd_ff_stream_release_duplex(ff);



	mutex_unlock(&ff->mutex);



	return snd_pcm_lib_free_vmalloc_buffer(substream);

}



static int pcm_playback_hw_free(struct snd_pcm_substream *substream)

static int pcm_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_ff *ff = substream->private_data;
@@ -385,8 +344,8 @@ int snd_ff_create_pcm_devices(struct snd_ff *ff) 
		.open		= pcm_open,

		.close		= pcm_close,

		.ioctl		= snd_pcm_lib_ioctl,

		.hw_params	= pcm_capture_hw_params,

		.hw_free	= pcm_capture_hw_free,

		.hw_params	= pcm_hw_params,

		.hw_free	= pcm_hw_free,

		.prepare	= pcm_capture_prepare,

		.trigger	= pcm_capture_trigger,

		.pointer	= pcm_capture_pointer,
@@ -397,8 +356,8 @@ int snd_ff_create_pcm_devices(struct snd_ff *ff) 
		.open		= pcm_open,

		.close		= pcm_close,

		.ioctl		= snd_pcm_lib_ioctl,

		.hw_params	= pcm_playback_hw_params,

		.hw_free	= pcm_playback_hw_free,

		.hw_params	= pcm_hw_params,

		.hw_free	= pcm_hw_free,

		.prepare	= pcm_playback_prepare,

		.trigger	= pcm_playback_trigger,

		.pointer	= pcm_playback_pointer,

CRA Git | Maintained and supported by SUSTech CRA and CCSE