Commit 15fbacfe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: wss: Use managed buffer allocation 

Clean up the driver with the new managed buffer allocation API.
The hw_free callback became superfluous and got dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-17-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a57214e5

sound/isa/wss/wss_lib.c

+2 −21
Original line number Diff line number Diff line
@@ -982,10 +982,7 @@ static int snd_wss_playback_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_wss *chip = snd_pcm_substream_chip(substream);

	unsigned char new_pdfr;

	int err;



	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)

		return err;

	new_pdfr = snd_wss_get_format(chip, params_format(hw_params),

				params_channels(hw_params)) |

				snd_wss_get_rate(params_rate(hw_params));
@@ -993,11 +990,6 @@ static int snd_wss_playback_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int snd_wss_playback_hw_free(struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_pages(substream);

}



static int snd_wss_playback_prepare(struct snd_pcm_substream *substream)

{

	struct snd_wss *chip = snd_pcm_substream_chip(substream);
@@ -1025,10 +1017,7 @@ static int snd_wss_capture_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_wss *chip = snd_pcm_substream_chip(substream);

	unsigned char new_cdfr;

	int err;



	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)

		return err;

	new_cdfr = snd_wss_get_format(chip, params_format(hw_params),

			   params_channels(hw_params)) |

			   snd_wss_get_rate(params_rate(hw_params));
@@ -1036,11 +1025,6 @@ static int snd_wss_capture_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int snd_wss_capture_hw_free(struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_pages(substream);

}



static int snd_wss_capture_prepare(struct snd_pcm_substream *substream)

{

	struct snd_wss *chip = snd_pcm_substream_chip(substream);
@@ -1889,7 +1873,6 @@ static const struct snd_pcm_ops snd_wss_playback_ops = { 
	.close =	snd_wss_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_wss_playback_hw_params,

	.hw_free =	snd_wss_playback_hw_free,

	.prepare =	snd_wss_playback_prepare,

	.trigger =	snd_wss_trigger,

	.pointer =	snd_wss_playback_pointer,
@@ -1900,7 +1883,6 @@ static const struct snd_pcm_ops snd_wss_capture_ops = { 
	.close =	snd_wss_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_wss_capture_hw_params,

	.hw_free =	snd_wss_capture_hw_free,

	.prepare =	snd_wss_capture_prepare,

	.trigger =	snd_wss_trigger,

	.pointer =	snd_wss_capture_pointer,
@@ -1927,8 +1909,7 @@ int snd_wss_pcm(struct snd_wss *chip, int device) 
		pcm->info_flags |= SNDRV_PCM_INFO_JOINT_DUPLEX;

	strcpy(pcm->name, snd_wss_chip_id(chip));



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      chip->card->dev,

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, chip->card->dev,

				       64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);



	chip->pcm = pcm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE