From patchwork Fri Nov 6 07:33:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrice CHOTARD X-Patchwork-Id: 11886303 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93088697 for ; Fri, 6 Nov 2020 07:34:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C81820936 for ; Fri, 6 Nov 2020 07:34:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="JEIfQOvb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbgKFHeR (ORCPT ); Fri, 6 Nov 2020 02:34:17 -0500 Received: from mx07-00178001.pphosted.com ([185.132.182.106]:56252 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726248AbgKFHeP (ORCPT ); Fri, 6 Nov 2020 02:34:15 -0500 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A67WAXP024861; Fri, 6 Nov 2020 08:34:10 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=HuL+1QubX11jEfHh0jLX+sDvnHzjyso9r7m7MxCcH9Q=; b=JEIfQOvbW17tK6kYUxOYDhO2xQK9TubGaeBokFcjPSSX9cOiAXXPQ2fBAmsgAZ5S8E3u INmJhNxLgHuJLWEfcMI8R8ZeQeaBJ/LLWDRXB47ieZaRhY5SbOG5860DYx/SmkD2Q+f5 D4OJYoTXftFrOHVjapYX77Spvo8wwm/acA5tPfIfeDW/oHJrkocuRXxS2rG2EckhYhMq UOICxTBVBnsFIiakX/qfnQoGnWAVLiA8hOqPoj/XEpGLHxQSPtQ+QK1bniCwVnTZ/VHq z8vWXGaIKoMwLO/Gf9n89EN3EAbgu/m0tS8qRV2R75kVzKEIrejSLxpCEQpzT82FBnD0 cw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 34h00etmn8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 08:34:10 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 97C84100034; Fri, 6 Nov 2020 08:34:09 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 8E123226678; Fri, 6 Nov 2020 08:34:09 +0100 (CET) Received: from localhost (10.75.127.50) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 6 Nov 2020 08:34:08 +0100 From: To: "Rafael J . Wysocki" , , , Ulf Hansson , Kevin Hilman CC: , Erwan Le Ray , Alexandre TORGUE , Fabrice Gasnier , Pierre-Yves MORDRET , , , Subject: [PATCH v1 3/4] PM: core: Make usage of device_wakeup_path() helper Date: Fri, 6 Nov 2020 08:33:57 +0100 Message-ID: <20201106073358.8379-4-patrice.chotard@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201106073358.8379-1-patrice.chotard@st.com> References: <20201106073358.8379-1-patrice.chotard@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG1NODE2.st.com (10.75.127.2) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-06_02:2020-11-05,2020-11-06 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Patrice Chotard Make usage of dev_wakeup_path() helper. Signed-off-by: Patrice Chotard --- drivers/base/power/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index c7ac49042cee..921c5b2ec30a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1359,7 +1359,7 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev) spin_lock_irq(&parent->power.lock); - if (dev->power.wakeup_path && !parent->power.ignore_children) + if (device_wakeup_path(dev) && !parent->power.ignore_children) parent->power.wakeup_path = true; spin_unlock_irq(&parent->power.lock); @@ -1627,7 +1627,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) goto Complete; /* Avoid direct_complete to let wakeup_path propagate. */ - if (device_may_wakeup(dev) || dev->power.wakeup_path) + if (device_may_wakeup(dev) || device_wakeup_path(dev)) dev->power.direct_complete = false; if (dev->power.direct_complete) {