From patchwork Fri Apr 26 15:38:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 792388 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17066C4345F for ; Fri, 26 Apr 2024 15:40:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A940214E7; Fri, 26 Apr 2024 17:40:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A940214E7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1714146015; bh=flcFCyFG2/t8hSowAIB01UznDgaflhSitPfuUrp0c60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XeQ9zOqes3A/vhvpm2AtObFee8WByMBBq8T86HQd6tRXV2/lxd7QMs655tbKOt1F6 qUeTW5GD1hr7MRDNiFWIZJw+hZxwB+6UgqO8/y+Eb3HprhvzWQZo8f9mnxSxJrYXFQ KCndcYvyWS2LdvRnwRE2ayrCpjd2HBBqzQ+vtf0E= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6D37FF805E6; Fri, 26 Apr 2024 17:39:26 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A6E05F805C7; Fri, 26 Apr 2024 17:39:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 69FF2F8003C; Fri, 26 Apr 2024 17:39:19 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EBAF0F8003C for ; Fri, 26 Apr 2024 17:39:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EBAF0F8003C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=T3yLmCm0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714145957; x=1745681957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=flcFCyFG2/t8hSowAIB01UznDgaflhSitPfuUrp0c60=; b=T3yLmCm0SE1oEB/11RAuIAOhWzBaj2Cl0OR0AfBvnlGHjI73JF8vzCxF 1Ac3sTocamDsxlzJVmqyXvGGGfg/YMNnK2LY9I/ea6/VkRZlPvf1yzN30 KACVKeJz8kswxE2sEYENyMApRyD2XKf0PWj4wvqDE0ATSINw+xuOkOA6s ig8A8Tx0DoRYW2zYzLV9j/+I51ZmKyYWm9uz0vN+t8nHSV8E75HEhJTOj KJ/Dp0wEK/nB/u89BfWlE9R9OoCSyvvMRZUWQQHhmpy0UwrWJ8iOLF0/3 ivYHxpNEMa2P+wDFzOTJgn6634F4oatuBuSXFB+lioYOy9K/2ZKbkqn4M w==; X-CSE-ConnectionGUID: Pq0DKgZER9SE/mldTNF3fg== X-CSE-MsgGUID: ZstzReK+Rg+rYwEM+gxY7w== X-IronPort-AV: E=McAfee;i="6600,9927,11056"; a="9718439" X-IronPort-AV: E=Sophos;i="6.07,233,1708416000"; d="scan'208";a="9718439" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2024 08:39:11 -0700 X-CSE-ConnectionGUID: WL7/LIeJRTSSuULWaJyWbA== X-CSE-MsgGUID: cILyGG/0QEKLlCU1ZdfHEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,233,1708416000"; d="scan'208";a="56623540" Received: from atarkhan-mobl2.amr.corp.intel.com (HELO pbossart-mobl6.intel.com) ([10.212.33.33]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2024 08:39:10 -0700 From: Pierre-Louis Bossart To: linux-sound@vger.kernel.org Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org, Yong Zhi , Ranjani Sridharan , Pierre-Louis Bossart Subject: [PATCH 2/5] ASoC: SOF: topology: remove incorrect widget id in error message Date: Fri, 26 Apr 2024 10:38:59 -0500 Message-Id: <20240426153902.39560-3-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240426153902.39560-1-pierre-louis.bossart@linux.intel.com> References: <20240426153902.39560-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: BE2JTTKN2Z5VXQENVSSIF7TTWYKOM7C6 X-Message-ID-Hash: BE2JTTKN2Z5VXQENVSSIF7TTWYKOM7C6 X-MailFrom: pierre-louis.bossart@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Yong Zhi In sof_widget_ready() function, the shift field of struct snd_soc_tplg_dapm_widget is incorrectly used to print widget id in dev_err(scomp->dev, "error: failed to add widget id %d ..", this patch removes the useless tw->shift from the error output. Reviewed-by: Ranjani Sridharan Signed-off-by: Yong Zhi Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/topology.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index bcdb499c96a0..ec931a26b54f 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1531,10 +1531,9 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, /* check token parsing reply */ if (ret < 0) { dev_err(scomp->dev, - "error: failed to add widget id %d type %d name : %s stream %s\n", - tw->shift, swidget->id, tw->name, - strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0 - ? tw->sname : "none"); + "failed to add widget type %d name : %s stream %s\n", + swidget->id, tw->name, strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0 + ? tw->sname : "none"); goto widget_free; }