From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sanyog Kale Subject: Re: [PATCH v5 1/9] soundwire: Fix duplicate stream state assignment Date: Tue, 10 Jul 2018 22:33:39 +0530 Message-ID: <20180710170338.GC22349@buildpc-HP-Z230> References: <1530791196-15483-1-git-send-email-shreyas.nc@intel.com> <1530791196-15483-2-git-send-email-shreyas.nc@intel.com> <31cd152c-b8f1-77eb-6a81-a6e5a1ac7101@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by alsa0.perex.cz (Postfix) with ESMTP id 675372676FE for ; Tue, 10 Jul 2018 19:03:43 +0200 (CEST) Content-Disposition: inline In-Reply-To: <31cd152c-b8f1-77eb-6a81-a6e5a1ac7101@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Pierre-Louis Bossart Cc: patches.audio@intel.com, gregkh@linuxfoundation.org, alsa-devel@alsa-project.org, vkoul@kernel.org, Shreyas NC List-Id: alsa-devel@alsa-project.org On Mon, Jul 09, 2018 at 06:41:40PM -0500, Pierre-Louis Bossart wrote: > > > On 07/05/2018 06:46 AM, Shreyas NC wrote: > >For a SoundWire stream it is expected that a Slave is added to the > >stream before Master is added. > > > >So, move the stream state to CONFIGURED after the first Slave is > >added and remove the stream state assignment for Master add. > >Along with these changes, add additional comments to explain the same. > > > >Signed-off-by: Shreyas NC > >--- > > drivers/soundwire/stream.c | 11 +++++++++-- > > 1 file changed, 9 insertions(+), 2 deletions(-) > > > >diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c > >index 8974a0f..37603c3 100644 > >--- a/drivers/soundwire/stream.c > >+++ b/drivers/soundwire/stream.c > >@@ -1123,8 +1123,6 @@ int sdw_stream_add_master(struct sdw_bus *bus, > > if (ret) > > goto stream_error; > >- stream->state = SDW_STREAM_CONFIGURED; > >- > > stream_error: > > sdw_release_master_stream(stream); > > error: > >@@ -1141,6 +1139,10 @@ EXPORT_SYMBOL(sdw_stream_add_master); > > * @stream: SoundWire stream > > * @port_config: Port configuration for audio stream > > * @num_ports: Number of ports > >+ * > >+ * It is expected that Slave is added before adding Master > >+ * to the Stream. > >+ * > > */ > > int sdw_stream_add_slave(struct sdw_slave *slave, > > struct sdw_stream_config *stream_config, > >@@ -1186,6 +1188,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, > > if (ret) > > goto stream_error; > >+ /* > >+ * Change stream state to CONFIGURED on first Slave add. > >+ * We don't know number of Slaves in a stream currently so cant > can't or cannot. Will fix this. > >+ * wait for all Slaves to be added > >+ */ > > stream->state = SDW_STREAM_CONFIGURED; > > goto error; > --