Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3229792pxu; Tue, 15 Dec 2020 01:44:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8H6Kn9XUFyalY+i3ndnpCS2FXW0Zum2zo1BJTjLQaAJM6Xgt/W/t6KQun+nXJTFdigCLV X-Received: by 2002:a17:906:878d:: with SMTP id za13mr25918243ejb.395.1608025442271; Tue, 15 Dec 2020 01:44:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608025442; cv=none; d=google.com; s=arc-20160816; b=gixaBoFA/FL7muSFm9yBNLKUgzaxy0yPkOwf5834StPZ5ybVSHJr3RmYp4UXoHPszs ILculELSm2M7IavXvYW3eymkEXcGuzYqY9PPg7lSD1wVGzU71yrqIh/IjeUPFMmNYYSm vTHVIyUIT3GozDa0w2wuqcAdLsFZrAQscm+XkszBq9vKOt88pyaaelJavdhuRwOfxCM+ JMa6cyPQLp+q+tgc1nMY0Lf2P7IhzRRTucIS5HhJ/qMezlqMwzT5Tjly2K5tIt4v6N+a v+YeOpPKYpJcM5mx/BCsJalSSrnL7xMyeL3zG8AZfzo3JCEX+0pOL1AU4xSlbHqLI2GI Oz1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=XA03w7jbKn9wOyGLVLC8W0B5MR0nTv7qjt1HXmIq1M8=; b=hWoQ+eIZSuUDq0d8XiaNUS5NfPC9SVyNc7fVC7jrwUcVHEQ1SIUkzvDSQAbH7xFuNi hfzBDDSkGLfp8xroguBq1bL8YGBn9EyafBZV2RpoD+QdRSBSd/T6uHOQnXIqiAYOW1H6 lKY7EMPPAqIsMQpBDFPkeNZJ+uqxtknopfNQk2GNSAFfJyhFWp1H5D/FiOM/Zf3eUU5b ++EsQXXlILJ1D27VZgP0L0wuxruD+ALdx1vPvKyaAPJyMdH4mISC+a8Hl2VcIZCKZ6Tb kWajd5SCJ0i5ZR3MgNWN0VU/jVfhhtBfKLQDFF49YBBh94631R3I/SMF5dXaMxKcAGF0 FTVw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id de26si574560edb.570.2020.12.15.01.43.39; Tue, 15 Dec 2020 01:44:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728333AbgLOJlD (ORCPT + 99 others); Tue, 15 Dec 2020 04:41:03 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:59060 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728200AbgLOJkc (ORCPT ); Tue, 15 Dec 2020 04:40:32 -0500 X-UUID: f7ab351191f14c849d8e2407f373e878-20201215 X-UUID: f7ab351191f14c849d8e2407f373e878-20201215 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 60192814; Tue, 15 Dec 2020 17:39:43 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 17:39:34 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 17:39:35 +0800 From: Stanley Chu To: , , , , CC: , , , , , , , , , , , , , , , , Stanley Chu Subject: [PATCH v1 1/4] scsi: ufs: Cleanup ufshcd_suspend_clkscaling function Date: Tue, 15 Dec 2020 17:39:31 +0800 Message-ID: <20201215093934.21223-2-stanley.chu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20201215093934.21223-1-stanley.chu@mediatek.com> References: <20201215093934.21223-1-stanley.chu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: A697137FF3D77AF70E1B83643F3DF2E5C7F94A04A846938C5771F16B97E9A4B32000:8 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cancelling suspend_work and resume_work is only required while suspending clk-scaling. Thus moving these two invokes into ufshcd_suspend_clkscaling() function. Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufshcd.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 052479a56a6f..a91b73a1fc48 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1451,6 +1451,9 @@ static void ufshcd_suspend_clkscaling(struct ufs_hba *hba) if (!ufshcd_is_clkscaling_supported(hba)) return; + cancel_work_sync(&hba->clk_scaling.suspend_work); + cancel_work_sync(&hba->clk_scaling.resume_work); + spin_lock_irqsave(hba->host->host_lock, flags); if (!hba->clk_scaling.is_suspended) { suspend = true; @@ -1514,9 +1517,6 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev, pm_runtime_get_sync(hba->dev); ufshcd_hold(hba, false); - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); - if (value) { ufshcd_resume_clkscaling(hba); } else { @@ -5663,11 +5663,8 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) ufshcd_vops_resume(hba, UFS_RUNTIME_PM); } else { ufshcd_hold(hba, false); - if (hba->clk_scaling.is_enabled) { - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); + if (hba->clk_scaling.is_enabled) ufshcd_suspend_clkscaling(hba); - } } down_write(&hba->clk_scaling_lock); hba->clk_scaling.is_allowed = false; @@ -8512,11 +8509,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) ufshcd_hold(hba, false); hba->clk_gating.is_suspended = true; - if (hba->clk_scaling.is_enabled) { - cancel_work_sync(&hba->clk_scaling.suspend_work); - cancel_work_sync(&hba->clk_scaling.resume_work); + if (hba->clk_scaling.is_enabled) ufshcd_suspend_clkscaling(hba); - } + down_write(&hba->clk_scaling_lock); hba->clk_scaling.is_allowed = false; up_write(&hba->clk_scaling_lock); -- 2.18.0