From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>, alsa-devel@alsa-project.org
Subject: [alsa-devel] [PATCH for-5.6 09/23] ASoC: siu_pcm: Use managed buffer allocation
Date: Tue, 10 Dec 2019 15:26:00 +0100 [thread overview]
Message-ID: <20191210142614.19405-10-tiwai@suse.de> (raw)
In-Reply-To: <20191210142614.19405-1-tiwai@suse.de>
Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous (the rest were
only debug prints) and got dropped.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/sh/siu_pcm.c | 39 +--------------------------------------
1 file changed, 1 insertion(+), 38 deletions(-)
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index a5e21e554da2..65637ad93630 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -281,41 +281,6 @@ static int siu_pcm_stmread_stop(struct siu_port *port_info)
return 0;
}
-static int siu_pcm_hw_params(struct snd_soc_component *component,
- struct snd_pcm_substream *ss,
- struct snd_pcm_hw_params *hw_params)
-{
- struct siu_info *info = siu_i2s_data;
- struct device *dev = ss->pcm->card->dev;
- int ret;
-
- dev_dbg(dev, "%s: port=%d\n", __func__, info->port_id);
-
- ret = snd_pcm_lib_malloc_pages(ss, params_buffer_bytes(hw_params));
- if (ret < 0)
- dev_err(dev, "snd_pcm_lib_malloc_pages() failed\n");
-
- return ret;
-}
-
-static int siu_pcm_hw_free(struct snd_soc_component *component,
- struct snd_pcm_substream *ss)
-{
- struct siu_info *info = siu_i2s_data;
- struct siu_port *port_info = siu_port_info(ss);
- struct device *dev = ss->pcm->card->dev;
- struct siu_stream *siu_stream;
-
- if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK)
- siu_stream = &port_info->playback;
- else
- siu_stream = &port_info->capture;
-
- dev_dbg(dev, "%s: port=%d\n", __func__, info->port_id);
-
- return snd_pcm_lib_free_pages(ss);
-}
-
static bool filter(struct dma_chan *chan, void *slave)
{
struct sh_dmae_slave *param = slave;
@@ -548,7 +513,7 @@ static int siu_pcm_new(struct snd_soc_component *component,
if (ret < 0)
return ret;
- snd_pcm_lib_preallocate_pages_for_all(pcm,
+ snd_pcm_set_managed_buffer_all(pcm,
SNDRV_DMA_TYPE_DEV, card->dev,
SIU_BUFFER_BYTES_MAX, SIU_BUFFER_BYTES_MAX);
@@ -584,8 +549,6 @@ struct const snd_soc_component_driver siu_component = {
.open = siu_pcm_open,
.close = siu_pcm_close,
.ioctl = snd_soc_pcm_lib_ioctl,
- .hw_params = siu_pcm_hw_params,
- .hw_free = siu_pcm_hw_free,
.prepare = siu_pcm_prepare,
.trigger = siu_pcm_trigger,
.pointer = siu_pcm_pointer_dma,
--
2.16.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-12-10 14:31 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 14:25 [alsa-devel] [PATCH for-5.6 00/23] ASoC: PCM API updates (part I) Takashi Iwai
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 01/23] ASoC: amd: Use managed buffer allocation Takashi Iwai
2019-12-11 16:54 ` [alsa-devel] Applied "ASoC: amd: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 02/23] ASoC: au1x: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: au1x: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 03/23] ASoC: dwc: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: dwc: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 04/23] ASoC: mediatek: Use managed buffer allocation Takashi Iwai
2019-12-11 16:47 ` Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 05/23] ASoC: meson: " Takashi Iwai
2019-12-11 9:49 ` Jerome Brunet
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: meson: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 06/23] ASoC: dma-sh7760: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: dma-sh7760: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 07/23] ASoC: fsi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: fsi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 08/23] ASoC: rcar: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rcar: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` Takashi Iwai [this message]
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: siu_pcm: " Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 10/23] ASoC: generic-dmaengine-pcm: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: generic-dmaengine-pcm: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 11/23] ASoC: SOF: Use managed buffer allocation Takashi Iwai
2019-12-11 16:47 ` Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 12/23] ASoC: stm32: " Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: stm32: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 13/23] ASoC: txx9: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: txx9: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 14/23] ASoC: uniphier: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: uniphier: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 15/23] ASoC: xilinx: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: xilinx: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 16/23] ASoC: xtensa: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: xtensa: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 17/23] ASoC: cros_ec_codec: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: cros_ec_codec: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 18/23] ASoC: rt5514-spi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rt5514-spi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 19/23] ASoC: rt5677-spi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rt5677-spi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 20/23] ASoC: intel: atom: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: atom: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 21/23] ASoC: intel: baytrail: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: baytrail: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 22/23] ASoC: intel: haswell: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: haswell: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 23/23] ASoC: intel: skylake: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: skylake: Use managed buffer allocation" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210142614.19405-10-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).