From nobody Sun May 10 18:34:48 2026 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 DD42BC433EF for ; Tue, 26 Apr 2022 23:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356251AbiDZX7q (ORCPT ); Tue, 26 Apr 2022 19:59:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356147AbiDZX7n (ORCPT ); Tue, 26 Apr 2022 19:59:43 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2604344750 for ; Tue, 26 Apr 2022 16:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651017394; x=1682553394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7gZI640vB7Fkwj7DXZ769dDtNYXHXh9PsK5UHotqXzY=; b=OoK10SN+XU0g5kzEuEO6CBLQwbfCs5dBkHvVt+URdU7TaZzr41/57QNB IrWYQwWrFyVfYPSQImyf+b8lEGJZXNT3JfdrTaUiqdufiuViW+6zFr27n Dt0nJhVJMzzONrv1TwvcjUVXJrcipUp0MU7FPHrj62Dz76KDvuAYGbjjq qiGND87wuRilb9bR8zUVD22iptX+eoRU1evk7tpBlqnY27FSod0c5Li07 Gq3fc6YKcVMLfzYgHBNadMafMOcYlAHRcXFkx+dUv+MuOtkdtWQPG2YiI Xzll8YnASw3D0TfTC/F77Kh2nooD0AXv0wLj0c0ug6VepS9MVobXHf0mo g==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="245682872" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="245682872" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:33 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730515015" Received: from htamura-mobl2.gar.corp.intel.com (HELO bard-pc.domain.name) ([10.252.185.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:31 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 1/5] soundwire: qcom: return error when pm_runtime_get_sync fails Date: Wed, 27 Apr 2022 07:56:19 +0800 Message-Id: <20220426235623.4253-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> References: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart For some reason there's a missing error return in two places. Fixes: 74e79da9fd46a ("soundwire: qcom: add runtime pm support") Fixes: 04d46a7b38375 ("soundwire: qcom: add in-band wake up interrupt suppo= rt") Signed-off-by: Pierre-Louis Bossart Reviewed-by: P=C3=A9ter Ujfalusi Signed-off-by: Bard Liao Reviewed-by: Srinivas Kandagatla --- drivers/soundwire/qcom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index f5fc8c27012a..c40c25f2d264 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -516,6 +516,7 @@ static irqreturn_t qcom_swrm_wake_irq_handler(int irq, = void *dev_id) "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); pm_runtime_put_noidle(swrm->dev); + return ret; } =20 if (swrm->wake_irq > 0) { @@ -1258,6 +1259,7 @@ static int swrm_reg_show(struct seq_file *s_file, voi= d *data) "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); pm_runtime_put_noidle(swrm->dev); + return ret; } =20 for (reg =3D 0; reg <=3D SWR_MSTR_MAX_REG_ADDR; reg +=3D 4) { --=20 2.25.1 From nobody Sun May 10 18:34:48 2026 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 6C7D3C433EF for ; Tue, 26 Apr 2022 23:56:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356262AbiDZX7v (ORCPT ); Tue, 26 Apr 2022 19:59:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356234AbiDZX7p (ORCPT ); Tue, 26 Apr 2022 19:59:45 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32F8148307 for ; Tue, 26 Apr 2022 16:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651017396; x=1682553396; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7EUtCKwJmlibbavHY3Ddf0LnLTbd6D1YbMdZzySp9tA=; b=BCk2EY4eoAXsm5g3E/+QrYJzYkcX468S15wH6vO5sWVxhtB+BCgBfG4e pV5IkzZ8KzFTcNs9lvmrBHLtmskp8irb5FgonChFP1Nxktc0WT2KIxwCK KyF2+GfVb9+zfEDn6ALrvLGbMUrZ3SpvI5lkEJlhU1blBTyEd75wMRUHh E2HJPlcEDEY8nZIxAbQSkMdadHVFm35cOcmAFoqgJCykel4xsv1mbnqq0 EoZ6TqleUXuPiDk8KBfyaG1DpeNIAjBMLCjFNf+pUVNDkKdM/61THqG1b rb4z5fzx7aKMyO/GeVBUrYk3BTaBuKBLd7V1k548qz4ooM6ODiW+mdMI1 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="245682875" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="245682875" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:35 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730515030" Received: from htamura-mobl2.gar.corp.intel.com (HELO bard-pc.domain.name) ([10.252.185.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:34 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 2/5] soundwire: bus: use pm_runtime_resume_and_get() Date: Wed, 27 Apr 2022 07:56:20 +0800 Message-Id: <20220426235623.4253-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> References: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and pm_runtime_put_noidle() pattern. No functional changes. Signed-off-by: Pierre-Louis Bossart Reviewed-by: P=C3=A9ter Ujfalusi Signed-off-by: Bard Liao --- drivers/soundwire/bus.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 354d3f89366f..193bf87866f6 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -536,11 +536,9 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_= t count, u8 *val) { int ret; =20 - ret =3D pm_runtime_get_sync(&slave->dev); - if (ret < 0 && ret !=3D -EACCES) { - pm_runtime_put_noidle(&slave->dev); + ret =3D pm_runtime_resume_and_get(&slave->dev); + if (ret < 0 && ret !=3D -EACCES) return ret; - } =20 ret =3D sdw_nread_no_pm(slave, addr, count, val); =20 @@ -562,11 +560,9 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size= _t count, const u8 *val) { int ret; =20 - ret =3D pm_runtime_get_sync(&slave->dev); - if (ret < 0 && ret !=3D -EACCES) { - pm_runtime_put_noidle(&slave->dev); + ret =3D pm_runtime_resume_and_get(&slave->dev); + if (ret < 0 && ret !=3D -EACCES) return ret; - } =20 ret =3D sdw_nwrite_no_pm(slave, addr, count, val); =20 @@ -1506,10 +1502,9 @@ static int sdw_handle_slave_alerts(struct sdw_slave = *slave) =20 sdw_modify_slave_status(slave, SDW_SLAVE_ALERT); =20 - ret =3D pm_runtime_get_sync(&slave->dev); + ret =3D pm_runtime_resume_and_get(&slave->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err(&slave->dev, "Failed to resume device: %d\n", ret); - pm_runtime_put_noidle(&slave->dev); return ret; } =20 --=20 2.25.1 From nobody Sun May 10 18:34:48 2026 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 98925C433F5 for ; Tue, 26 Apr 2022 23:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356285AbiD0AAN (ORCPT ); Tue, 26 Apr 2022 20:00:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356253AbiDZX7r (ORCPT ); Tue, 26 Apr 2022 19:59:47 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282D0488A9 for ; Tue, 26 Apr 2022 16:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651017398; x=1682553398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tA/0dx3kOuM/bOmv9rB+8wuyPRn5khLhY2aFJCWhgdE=; b=E2zxf8Mm/87/BTPpgZ1Z2iAhIno3PIqS8lta4ejBUoo5sTxUf42A7myT k7oS8/e8RrMzSUraAPN61abbehxb4u5vtuK/wh+MwFS7yFXzO/SM+Fkbh 1Az1LELSNLOTl0t0QH5shYWh9HxBipjG7AR7K7Gpex9Mc3sq5gCtJgP2u xGiXAq+C3CJjlFTGj12gtrKAcY7WZX0yXqOuUp/MtoSLZvY8t84EkEXP8 6t5G/Mvk1aCg+1zAs2OWHEMgjZ5sQzKNCGZyyBvowKmRMDTPyiOQ3mCGk ORpOPuZsfPWGsg9MpBr7+82XcsGpeYc0xMF7qcdRQvlZHVKJYQHpPqX7i w==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="245682880" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="245682880" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:37 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730515038" Received: from htamura-mobl2.gar.corp.intel.com (HELO bard-pc.domain.name) ([10.252.185.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:36 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 3/5] soundwire: cadence: use pm_runtime_resume_and_get() Date: Wed, 27 Apr 2022 07:56:21 +0800 Message-Id: <20220426235623.4253-4-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> References: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and pm_runtime_put_noidle() pattern. No functional changes. Signed-off-by: Pierre-Louis Bossart Reviewed-by: P=C3=A9ter Ujfalusi Signed-off-by: Bard Liao --- drivers/soundwire/cadence_master.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence= _master.c index 558390af44b6..a53a777f2241 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -386,12 +386,11 @@ static int cdns_parity_error_injection(void *data, u6= 4 value) * Resume Master device. If this results in a bus reset, the * Slave devices will re-attach and be re-enumerated. */ - ret =3D pm_runtime_get_sync(bus->dev); + ret =3D pm_runtime_resume_and_get(bus->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err_ratelimited(cdns->dev, - "pm_runtime_get_sync failed in %s, ret %d\n", + "pm_runtime_resume_and_get failed in %s, ret %d\n", __func__, ret); - pm_runtime_put_noidle(bus->dev); return ret; } =20 --=20 2.25.1 From nobody Sun May 10 18:34:48 2026 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 14D09C433F5 for ; Tue, 26 Apr 2022 23:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356269AbiDZX7y (ORCPT ); Tue, 26 Apr 2022 19:59:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356258AbiDZX7t (ORCPT ); Tue, 26 Apr 2022 19:59:49 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CD134924D for ; Tue, 26 Apr 2022 16:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651017400; x=1682553400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V6orb7xMJrGLhUt7lGhLbHJI6NNpt/GIKG7ukF/7V64=; b=dzbBfBPvl73DJ17Wb+QITy5Mc35KL2GGdSvR7hGz/aNi0QExNwPRXeXo 4IIxdsOpJrJzkG8n9urtNjWcTky+jggtEGR1qW0DHsxrLV4aowKMBkQt/ uijbBwyGq+uGWBpF4uXkEp7JveqYYvIY8T7Q5/eUmk9VW22T9bkvoR5+5 LDPnIdYTUUFwT2ro9moox8qpB6zbaeYp6IVSkqILyPbK02c+kG+r9Syxs AJNe+shWxTJlB5ERCGAHTbI6nIsYGSufoW5K3QQknF0HAz5deh/OjpL3+ 8Li3WRSuMi+UYExuJk5LJIhl/YXk6zpP8OWcpqiU5REu1eY2ja4pJU+6/ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="245682884" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="245682884" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:39 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730515044" Received: from htamura-mobl2.gar.corp.intel.com (HELO bard-pc.domain.name) ([10.252.185.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:38 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 4/5] soundwire: intel: use pm_runtime_resume_and_get() Date: Wed, 27 Apr 2022 07:56:22 +0800 Message-Id: <20220426235623.4253-5-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> References: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and pm_runtime_put_noidle() pattern. No functional changes. Signed-off-by: Pierre-Louis Bossart Reviewed-by: P=C3=A9ter Ujfalusi Signed-off-by: Bard Liao --- drivers/soundwire/intel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 63101f1ba271..ad41b50f2ef1 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -799,12 +799,11 @@ static int intel_startup(struct snd_pcm_substream *su= bstream, struct sdw_cdns *cdns =3D snd_soc_dai_get_drvdata(dai); int ret; =20 - ret =3D pm_runtime_get_sync(cdns->dev); + ret =3D pm_runtime_resume_and_get(cdns->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err_ratelimited(cdns->dev, - "pm_runtime_get_sync failed in %s, ret %d\n", + "pm_runtime_resume_and_get failed in %s, ret %d\n", __func__, ret); - pm_runtime_put_noidle(cdns->dev); return ret; } return 0; --=20 2.25.1 From nobody Sun May 10 18:34:48 2026 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 17074C433F5 for ; Tue, 26 Apr 2022 23:57:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356268AbiD0AAH (ORCPT ); Tue, 26 Apr 2022 20:00:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356263AbiDZX7v (ORCPT ); Tue, 26 Apr 2022 19:59:51 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40CE749C9C for ; Tue, 26 Apr 2022 16:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651017402; x=1682553402; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8buaCP5WAQdOwNeI5o7LDn1PP+ytMuRXjlhLzBrLdD8=; b=QPlfMCj91+C0geqGSHxzZ5hjalrMvDyUPzCAM5/qVMoU1Z8LX3rgDM0y 8tVH8iO+6ThMjoBRwNhuWMi3xCixmuM7kKVzCS8lC8vLlRXRdjkkAFxLo vGnAjBASM9M2WJmi7yzndC7ZWGf9Y03mlYYPhzdqUqu/dfihgNk0UrYsO YeCiKbJsREBUr7QSybQjH0wW+wwQocytTiyQOmyvBm9OWr88xILKaoann cz4ZZw5fTzrSn80LNIAzuQcj6+8Ci+GLZKjOvlIEPq0tf+/5rLRlwvCkl XYucM/oRV7EFfzLjLcPW9opKClz4PgNGJvEthk1xYCKnNC1mwv2cPQxgP Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="245682893" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="245682893" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:41 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="730515051" Received: from htamura-mobl2.gar.corp.intel.com (HELO bard-pc.domain.name) ([10.252.185.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 16:56:40 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 5/5] soundwire: qcom: use pm_runtime_resume_and_get() Date: Wed, 27 Apr 2022 07:56:23 +0800 Message-Id: <20220426235623.4253-6-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> References: <20220426235623.4253-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and pm_runtime_put_noidle() pattern. No functional changes. Signed-off-by: Pierre-Louis Bossart Reviewed-by: P=C3=A9ter Ujfalusi Signed-off-by: Bard Liao Reviewed-by: Srinivas Kandagatla --- drivers/soundwire/qcom.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index c40c25f2d264..c244d31805cc 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -510,12 +510,11 @@ static irqreturn_t qcom_swrm_wake_irq_handler(int irq= , void *dev_id) struct qcom_swrm_ctrl *swrm =3D dev_id; int ret; =20 - ret =3D pm_runtime_get_sync(swrm->dev); + ret =3D pm_runtime_resume_and_get(swrm->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err_ratelimited(swrm->dev, - "pm_runtime_get_sync failed in %s, ret %d\n", + "pm_runtime_resume_and_get failed in %s, ret %d\n", __func__, ret); - pm_runtime_put_noidle(swrm->dev); return ret; } =20 @@ -1059,12 +1058,11 @@ static int qcom_swrm_startup(struct snd_pcm_substre= am *substream, struct snd_soc_dai *codec_dai; int ret, i; =20 - ret =3D pm_runtime_get_sync(ctrl->dev); + ret =3D pm_runtime_resume_and_get(ctrl->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err_ratelimited(ctrl->dev, - "pm_runtime_get_sync failed in %s, ret %d\n", + "pm_runtime_resume_and_get failed in %s, ret %d\n", __func__, ret); - pm_runtime_put_noidle(ctrl->dev); return ret; } =20 @@ -1253,12 +1251,11 @@ static int swrm_reg_show(struct seq_file *s_file, v= oid *data) struct qcom_swrm_ctrl *swrm =3D s_file->private; int reg, reg_val, ret; =20 - ret =3D pm_runtime_get_sync(swrm->dev); + ret =3D pm_runtime_resume_and_get(swrm->dev); if (ret < 0 && ret !=3D -EACCES) { dev_err_ratelimited(swrm->dev, - "pm_runtime_get_sync failed in %s, ret %d\n", + "pm_runtime_resume_and_get failed in %s, ret %d\n", __func__, ret); - pm_runtime_put_noidle(swrm->dev); return ret; } =20 --=20 2.25.1