From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D18DC7EE2E for ; Mon, 12 Jun 2023 16:58:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234123AbjFLQ6I (ORCPT ); Mon, 12 Jun 2023 12:58:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232637AbjFLQ6F (ORCPT ); Mon, 12 Jun 2023 12:58:05 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8EE619C; Mon, 12 Jun 2023 09:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686589084; x=1718125084; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=YIGvFiBNE3NCF0ZwQgckoo2K32v08RKeLs7L8rmrvD8=; b=B/W6QBYHDPClYr9GbZ5FcOUe6RsDrtqBtUHmaly4GQB3mV51jIf1+0jE pJnghZkXeRF5Ul5rze0yi3fkijAdelXsqyyN1k4DUTNaffbBB6k0MosWK wzBurWDdiCAaVoY81oLxuZDQptqNf9G/ClnAtVh2Q5Z5wTvjC6i9+3xzD 2s/oSdjhM504ydqllun3b+G2guoBTt3N9ZVjWAR913GSm4DMeqnLBmkux lzUEq6oCnwBJrOUMJ0mNdZsuWKkJTgHhRMa+qPeWpn6x+zuLmKLSlqi04 TUwKFoPYEt9DkkfhPOl+gHTqlPQCszUUPk4qKG80GSoYcTt+nBY50QLO0 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="338464657" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="338464657" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 09:58:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="705467168" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="705467168" Received: from atulpuri-mobl1.amr.corp.intel.com (HELO [10.212.234.150]) ([10.212.234.150]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 09:58:02 -0700 Message-ID: Date: Mon, 12 Jun 2023 11:58:02 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.11.0 Subject: Re: [PATCH] ASoC: SOF: ipc4-topology: Improve unlocking of a mutex in sof_ipc4_widget_free() Content-Language: en-US To: Markus Elfring , kernel-janitors@vger.kernel.org, alsa-devel@alsa-project.org, sound-open-firmware@alsa-project.org, Bard Liao , Daniel Baluta , Jaroslav Kysela , Jyri Sarha , Kai Vehmanen , Liam Girdwood , Mark Brown , Peter Ujfalusi , Rander Wang , Ranjani Sridharan Cc: LKML , cocci@inria.fr, Dan Carpenter References: <20230322181830.574635-1-jyri.sarha@linux.intel.com> <3a7476b6-2ae9-494e-1840-0915ddf47c2f@web.de> From: Pierre-Louis Bossart In-Reply-To: <3a7476b6-2ae9-494e-1840-0915ddf47c2f@web.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/10/23 06:36, Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 10 Jun 2023 12:40:09 +0200 > > Add a jump target so that a call of the function “mutex_unlock” > is stored only once in this function implementation. > > Signed-off-by: Markus Elfring > --- > sound/soc/sof/ipc4-topology.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c > index a4e1a70b607d..f0fd1dfa384e 100644 > --- a/sound/soc/sof/ipc4-topology.c > +++ b/sound/soc/sof/ipc4-topology.c > @@ -2300,8 +2300,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget > if (pipeline->use_chain_dma) { > dev_warn(sdev->dev, "use_chain_dma set for scheduler %s", > swidget->widget->name); > - mutex_unlock(&ipc4_data->pipeline_state_mutex); > - return 0; > + goto unlock; > } > > header = SOF_IPC4_GLB_PIPE_INSTANCE_ID(swidget->instance_id); > @@ -2326,7 +2325,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget > if (!pipeline->use_chain_dma) > ida_free(&fw_module->m_ida, swidget->instance_id); > } > - > +unlock: > mutex_unlock(&ipc4_data->pipeline_state_mutex); > > return ret; The change looks good but I am wondering if we need to print a dev_warn log which is already done on the sof_ipc4_widget_setup() path. This seems redundant. Ranjani, can we simplify?