[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200212101554.GB2618@vkoul-mobl>
Date: Wed, 12 Feb 2020 15:45:54 +0530
From: Vinod Koul <vkoul@...nel.org>
To: Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>
Cc: alsa-devel@...a-project.org, linux-kernel@...r.kernel.org,
tiwai@...e.de, broonie@...nel.org, gregkh@...uxfoundation.org,
jank@...ence.com, srinivas.kandagatla@...aro.org,
slawomir.blauciak@...el.com,
Bard liao <yung-chuan.liao@...ux.intel.com>,
Rander Wang <rander.wang@...ux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@...ux.intel.com>,
Sanyog Kale <sanyog.r.kale@...el.com>
Subject: Re: [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
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@...ux.intel.com>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@...ux.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
Powered by blists - more mailing lists