From patchwork Fri Jan 13 00:54:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 42888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp7743wrt; Thu, 12 Jan 2023 16:55:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXshmTk0B3jNHprg4BBK4BKnM1hgzs1v5DjrMvmhpXKuC2oFWf3mmlZJZKfSLNiOr0fJJQ4n X-Received: by 2002:aa7:9489:0:b0:583:4801:76f0 with SMTP id z9-20020aa79489000000b00583480176f0mr25091560pfk.23.1673571325662; Thu, 12 Jan 2023 16:55:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673571325; cv=none; d=google.com; s=arc-20160816; b=C0PwHbl4LQ2H2tuN38vyyLkrUzrHy2oQMEJMjMDlQwXcBU/nY/rkdYMpApxFr0xZCk jhF3ytiLFCN0//CZAXUqgZHqKsbtAWftsmCw0WBNIhQ2yOAh04f22j+iZZeoGcDb/p0r jP0VcqFUaactmhNZXP8490oASE0uDGyYgQ7GdrmR0ixBWgIW/O+jsPK04TMYVWY4vOZp sB9BdtMpFPlw9rNQfuRuKn62y8oOkbKh0hPA6q/yqXy7bHU0HGXgjFdZkLCEYvdgqouq xf95jPrmfMVzZz1CfWvfzq6eBR+s5V9wvxDlNy1WWMRBi/3RGXgEebir2xbUH7S4pafg y3Vw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PobSF2/MDkJrX0shmq4Y9cOMyGXHMWsuX8BGemf4VBw=; b=bOaPdo03kTgbgn9VYpRqvBeBKgcEk4/FTCFeTha3d+cgSYGtPaNxFOWa3gyNzcIdHx pc/Jf/xaDo9/YBlt6PsgfRPFctkZD5Emkb5RwyCuZlJU9i0Q4P029zyGjAeiDoFhwEYN 3RHepuy1Plqz5eQJSL6lmgNNEmsCGyjMeyoRLCcBlUc+Gi7OTJ9pfzpI7uZjuzsDsj9W kGp8u1hENIXK9CglQ0duMOMunHkc/FIIyUks+mIe+rFnURsVTAOqNVon9xmw4eFV+ae0 WfIMqD6n6NRtMGUfxnyFY3Pwvm8EjaSNy20hoh48vAp/F2ASW6uXm7HxSRqXpR65Y3Dp O6bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Osh1B7zp; 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=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f14-20020a056a00228e00b005803e22494fsi3341530pfe.282.2023.01.12.16.55.09; Thu, 12 Jan 2023 16:55:25 -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=@chromium.org header.s=google header.b=Osh1B7zp; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233576AbjAMAyd (ORCPT + 99 others); Thu, 12 Jan 2023 19:54:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234031AbjAMAyK (ORCPT ); Thu, 12 Jan 2023 19:54:10 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1390D120A8 for ; Thu, 12 Jan 2023 16:54:10 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id p24so21882571plw.11 for ; Thu, 12 Jan 2023 16:54:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PobSF2/MDkJrX0shmq4Y9cOMyGXHMWsuX8BGemf4VBw=; b=Osh1B7zp7tQhU+9MxWPY/yAEEmUj1gtkg7jmpWJk9NgmbGtaRDmTSetrchIDDB96H+ p/qRxiUkZPIgdLp122//Q4wMQJBff8z5Wllf5G5VRmLI1m4fSX5EcrMKZqaReT11PdfM P6fr4Mh9AH5OB+SOA9myUKG6PNEbejlcVIpio= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PobSF2/MDkJrX0shmq4Y9cOMyGXHMWsuX8BGemf4VBw=; b=X8xUhYwdAuxn8UKguKWb7NxDIeXj+CbSa9A7P8fC0h5ro7HWpyp7yXR453gA+d+PWZ dgEGjVNqiBnS7pJyNaeP9arOhKbBVZ9rUAr3QEroIAy2Z8EtszUGDI9VUqkw0e/8kqLu jnZP4HI59mv8gl4OJcsI7Qsblv9Qv201VnExgVEPAv8Dhzig4TWNFhOuGq0Mdv0mTjFs mea4hcXqX2aL9tTwwPNdewhJZZEBOxcP3ovq6Ao8dkrpfjEYznNnn4CECwQ9i5nXzuuN KHf420QP/QJETFVgdPuaToS1y6iZw1becFQYgMo+5S4XJ5q/d1j+leTtzytEcGOuJR0E vDfQ== X-Gm-Message-State: AFqh2kr05k/q6M67xNp7eUVU0P2c4+I6Q8aKr5hHZEMdafpI11MMVjy0 nvvsU3eieDJcJAVRMPwJXAUr2Q== X-Received: by 2002:a05:6a20:9588:b0:b2:549c:b0eb with SMTP id iu8-20020a056a20958800b000b2549cb0ebmr99249330pzb.36.1673571249545; Thu, 12 Jan 2023 16:54:09 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:11a:201:4652:3752:b9b7:29f9]) by smtp.gmail.com with ESMTPSA id u11-20020a6540cb000000b0046ff3634a78sm10676614pgp.71.2023.01.12.16.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 16:54:08 -0800 (PST) From: Stephen Boyd To: stable@vger.kernel.org Cc: Johan Hovold , linux-kernel@vger.kernel.org, patches@lists.linux.dev, Dmitry Baryshkov , Vinod Koul Subject: [PATCH 5.15.y 1/4] phy: qcom-qmp-combo: disable runtime PM on unbind Date: Thu, 12 Jan 2023 16:54:02 -0800 Message-Id: <20230113005405.3992011-2-swboyd@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230113005405.3992011-1-swboyd@chromium.org> References: <20230113005405.3992011-1-swboyd@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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?1754866726437694869?= X-GMAIL-MSGID: =?utf-8?q?1754866726437694869?= From: Johan Hovold commit 4382d518d1887e62234560ea08a0203d11d28cc1 upstream. Make sure to disable runtime PM also on driver unbind. Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM"). Signed-off-by: Johan Hovold Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Stephen Boyd --- drivers/phy/qualcomm/phy-qcom-qmp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index a9687e040960..7b7557c35af6 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -5740,7 +5740,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) return -ENOMEM; pm_runtime_set_active(dev); - pm_runtime_enable(dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; /* * Prevent runtime pm from being ON by default. Users can enable * it using power/control in sysfs. @@ -5790,13 +5792,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); if (!IS_ERR(phy_provider)) dev_info(dev, "Registered Qcom-QMP phy\n"); - else - pm_runtime_disable(dev); return PTR_ERR_OR_ZERO(phy_provider); err_node_put: - pm_runtime_disable(dev); of_node_put(child); return ret; }