From: Vinod Koul <vkoul@kernel.org>
To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: alsa-devel@alsa-project.org, tiwai@suse.de,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
broonie@kernel.org, srinivas.kandagatla@linaro.org,
jank@cadence.com, slawomir.blauciak@intel.com,
Sanyog Kale <sanyog.r.kale@intel.com>,
Bard liao <yung-chuan.liao@linux.intel.com>,
Rander Wang <rander.wang@linux.intel.com>
Subject: Re: [alsa-devel] [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
Date: Wed, 12 Feb 2020 15:45:54 +0530 [thread overview]
Message-ID: <20200212101554.GB2618@vkoul-mobl> (raw)
In-Reply-To: <20200114234257.14336-6-pierre-louis.bossart@linux.intel.com>
On 14-01-20, 17:42, Pierre-Louis Bossart wrote:
> Make sure all calls to the SoundWire stream API are done and involve
> callback
>
> Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> drivers/soundwire/intel.c | 40 +++++++++++++++++++++++++++++++++++++--
> 1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index c498812522ab..e0c1fff7c4a0 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -550,6 +550,25 @@ static int intel_params_stream(struct sdw_intel *sdw,
> return -EIO;
> }
>
> +static int intel_free_stream(struct sdw_intel *sdw,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai,
> + int link_id)
> +{
> + struct sdw_intel_link_res *res = sdw->link_res;
> + struct sdw_intel_stream_free_data free_data;
where is this struct sdw_intel_stream_free_data defined. I dont see it
in this patch or this series..
> +
> + free_data.substream = substream;
> + free_data.dai = dai;
> + free_data.link_id = link_id;
> +
> + if (res->ops && res->ops->free_stream && res->dev)
> + return res->ops->free_stream(res->dev,
> + &free_data);
> +
> + return 0;
> +}
> +
> /*
> * bank switch routines
> */
> @@ -817,6 +836,7 @@ static int
> intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
> {
> struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
> + struct sdw_intel *sdw = cdns_to_intel(cdns);
> struct sdw_cdns_dma_data *dma;
> int ret;
>
> @@ -824,12 +844,28 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
> if (!dma)
> return -EIO;
>
> + ret = sdw_deprepare_stream(dma->stream);
> + if (ret) {
> + dev_err(dai->dev, "sdw_deprepare_stream: failed %d", ret);
> + return ret;
> + }
> +
> ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(dai->dev, "remove master from stream %s failed: %d\n",
> dma->stream->name, ret);
> + return ret;
> + }
>
> - return ret;
> + ret = intel_free_stream(sdw, substream, dai, sdw->instance);
> + if (ret < 0) {
> + dev_err(dai->dev, "intel_free_stream: failed %d", ret);
> + return ret;
> + }
> +
> + sdw_release_stream(dma->stream);
I think, free the 'name' here would be apt
--
~Vinod
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2020-02-12 10:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 23:42 [alsa-devel] [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
2020-01-14 23:42 ` [alsa-devel] [PATCH v2 1/5] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2020-01-14 23:42 ` [alsa-devel] [PATCH v2 2/5] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
2020-01-14 23:42 ` [alsa-devel] [PATCH v2 3/5] soundwire: intel: add trigger " Pierre-Louis Bossart
2020-01-14 23:42 ` [alsa-devel] [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
2020-02-12 10:12 ` Vinod Koul
2020-01-14 23:42 ` [alsa-devel] [PATCH v2 5/5] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
2020-02-12 10:15 ` Vinod Koul [this message]
2020-02-12 15:37 ` Pierre-Louis Bossart
2020-02-13 4:23 ` Vinod Koul
2020-02-13 15:05 ` Pierre-Louis Bossart
2020-02-10 14:28 ` [alsa-devel] [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
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=20200212101554.GB2618@vkoul-mobl \
--to=vkoul@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=yung-chuan.liao@linux.intel.com \
/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).