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

ALSA: fireworks: code refactoring for pcm.hw_params/hw_free 



Two sets of callbacks for pcm.hw_params/hw_free but they have the same
codes. This commit unifies each of the callbacks.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent add147ad

sound/firewire/fireworks/fireworks_pcm.c

+6 −39
Original line number Diff line number Diff line
@@ -219,7 +219,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_efw *efw = substream->private_data;
@@ -238,41 +238,8 @@ 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_efw *efw = 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) {

		mutex_lock(&efw->mutex);

		++efw->substreams_counter;

		mutex_unlock(&efw->mutex);

	}



	return 0;

}



static int pcm_capture_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_efw *efw = substream->private_data;



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

		mutex_lock(&efw->mutex);

		--efw->substreams_counter;

		mutex_unlock(&efw->mutex);

	}



	snd_efw_stream_stop_duplex(efw);



	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_efw *efw = substream->private_data;
@@ -378,8 +345,8 @@ int snd_efw_create_pcm_devices(struct snd_efw *efw) 
		.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,
@@ -390,8 +357,8 @@ int snd_efw_create_pcm_devices(struct snd_efw *efw) 
		.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