From patchwork Thu Mar 9 05:49:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 66601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp118588wrd; Wed, 8 Mar 2023 22:04:47 -0800 (PST) X-Google-Smtp-Source: AK7set/wMaHvdxhfxt+OeaROnYf2S/sR+8GVxm3CQl/aNURGIqbR7YHfYabMmnhcIv0qlLutBB0Q X-Received: by 2002:a17:902:b70e:b0:19c:a9bc:ce57 with SMTP id d14-20020a170902b70e00b0019ca9bcce57mr17933700pls.64.1678341887570; Wed, 08 Mar 2023 22:04:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678341887; cv=none; d=google.com; s=arc-20160816; b=JmfbgglWW0ZXjZA5Z2B7FGBJCjnteE4+Otfnb+c8fF9ekIV5iFtwJqWTco44wd/7aR aXJAHDuq4rNO9/Ud1aD979Im7PyCOPgnI8UIz6+otWmctwhY7MprnFIbQXE6NpH+/Ye9 3mMVM+4vZAz4da+4rSAaML5LhfGfhcN6F+FZBzxPfTUCwNl+JOQ1zdxUaGL+77BEEX/5 oS1xE8ElytBJIGwVoLWJkzJWDegviQj1A364JsUz8je6lzWZnWh59fVX/rzCorsxbWas bXl6zrWvIpQPtjIIC/p0VPz5ubiIP4QtYfz968w9WOC99lyG2lXgQtd5oqxcSFADcY0L GXdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=eoevpEGnc4Y+Q+R2b5l37S27T6fKny+K1VtPTVEL4lE=; b=K9VlYLKgs2IIGcL5cJTQmjKXdj1fY+7QZeVIZUvqFxAeDNhMF2xymgMpmkgjgAnLd0 ipbsXy78PIBKJD2qg68PBG/6gpDAymCt+CHB8a17LCY3StY78z95QaFiXtoNu7fJNCN2 Tti+sTUXCU73MfPpL/CyAQavJzcqjNkVWdqR+pHqghY69qKzTEFVaEc0lwunEdDeWQ+N jxaHYUlbkcFG0S+4lvXrVopSuZmGWzJSCrdzgQeFaXx3yeNJwu/BZ6KbDifCCaRbe5QS Bc5xr/2BsKb+GTvthKnwAH4WsN7x0OMTgUEJPFfQmUyMoS4hLwH4OXVWVr5cKU2lD97T aPfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TPhNpZwZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ke15-20020a170903340f00b0019e41554031si15213551plb.628.2023.03.08.22.04.29; Wed, 08 Mar 2023 22:04:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TPhNpZwZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbjCIFhR (ORCPT + 99 others); Thu, 9 Mar 2023 00:37:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbjCIFgp (ORCPT ); Thu, 9 Mar 2023 00:36:45 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3DDA2D45 for ; Wed, 8 Mar 2023 21:35:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678340127; x=1709876127; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=h4Z7o2fU92HDfcLA/HWUmcnZgpdErsjzQ5HEffu/E6A=; b=TPhNpZwZXcIU/UqZgGjDsPb8AEFIGkTMthkV7Ynwy4e/PTW9j6BQzMIY JAdZGMYeaTNns4O2VwFOGEerHOiOF22LE2vnS7LV+m2pMeWSKp/I3ez7T EK4/ym2r6BDt2huaC8dQfnyE1G4Ze/3vi+SPfH+RnXNV9TcBJR6rQGoS3 V1GqGi+0dpyU/XIRMiDn5iln/alL0sBf0S720YMO444NLPKPSv36oriSL zDPJS3Yw+wwo6SdrXCGdyv96iq8ha8DDlA8AoJkBkhVx9pcmT1RgSuoPn iOSkfzarznmqBVPHKkPoqmq4ZwcShtHPzWJkK5PyTC6rDTqcI1oUWAZSF A==; X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="335061912" X-IronPort-AV: E=Sophos;i="5.98,245,1673942400"; d="scan'208";a="335061912" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2023 21:35:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="746177909" X-IronPort-AV: E=Sophos;i="5.98,245,1673942400"; d="scan'208";a="746177909" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2023 21:35:19 -0800 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com Subject: [PATCH] soundwire: stream: uniquify dev_err() logs Date: Thu, 9 Mar 2023 13:49:05 +0800 Message-Id: <20230309054905.21507-1-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759869023193994451?= X-GMAIL-MSGID: =?utf-8?q?1759869023193994451?= From: Pierre-Louis Bossart There are a couple of duplicate logs which makes harder than needed to follow the error flows. Add __func__ or make the log unique. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Signed-off-by: Bard Liao --- drivers/soundwire/stream.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 2e39587ed1de..dd09855caac9 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, ret = do_bank_switch(stream); if (ret < 0) { - dev_err(bus->dev, "Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); goto restore_params; } @@ -1477,7 +1477,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } @@ -1497,7 +1497,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) ret = do_bank_switch(stream); if (ret < 0) { - dev_err(bus->dev, "Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); return ret; } @@ -1567,14 +1567,14 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } } ret = do_bank_switch(stream); if (ret < 0) { - pr_err("Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); return ret; } @@ -1664,7 +1664,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } } @@ -1893,7 +1893,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, m_rt = sdw_master_rt_alloc(bus, stream); if (!m_rt) { - dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name); + dev_err(bus->dev, "%s: Master runtime alloc failed for stream:%s\n", + __func__, stream->name); ret = -ENOMEM; goto unlock; } @@ -2012,7 +2013,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave, */ m_rt = sdw_master_rt_alloc(slave->bus, stream); if (!m_rt) { - dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name); + dev_err(&slave->dev, "%s: Master runtime alloc failed for stream:%s\n", + __func__, stream->name); ret = -ENOMEM; goto unlock; }