From nobody Fri Oct 2 13:07:30 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1158253340 for ; Fri, 31 Jul 2026 08:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785486546; cv=none; b=i+OPAEjUMtgFwge6R9ZeuVKvbv/eFP69/xURHVRN8g+PlMbDbfMURFNHk964VzjUUpseZQ65Z4EIVc9RRPymxhtQErf/kKlvP03EWwL6yectKMD9buIlONLI5xDVt0+56hkW9JZvX559U2psZtxjiHDryUjBQ89XGrGXMpEB4vk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785486546; c=relaxed/simple; bh=1GlGb33gRFeu0ldp5kUwM7ApHq+RZYDeUNAyNeeeQn8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=UJQIAdK/ukI7K3eA2KaXF2LUlZn0W5YJjuM3uIuQyNComi+goDHHPupzT2zeubx8HcCYFpxaCo6h3htdbtrI3JEpMQuUkpKdOkq7oTEa1wuzzICBYYa4Aee2Wff56QdyEQ/5WQRxFIbpgAjFONBeylG9Fw0roUckZ6qfB9VG0Qg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=GTCrjKsc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=a8sFxIC0; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="GTCrjKsc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="a8sFxIC0" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66V7vZ8p3672720 for ; Fri, 31 Jul 2026 08:29:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=xxXBjOQaVivJJP+m3lH/e6 Blj4o5INx0Tg6Ob2u8pnA=; b=GTCrjKsc7pOSyxjYJrmw9OUnCjxz7yB5X5zfxP vYY+TpGyRhhM9FifAOk0I9JK3yZdry3f6DcxkIdvd9J/bSrXtQrPn2rl4m+/xBil OGEmsbii3e8kGItxE75rvypznqI2UDMyZVQXxY/hVT9hki28ZoazKMSpv5TD6q2Q nASLm8wboCOF//N8fVN6W4iq4fq5nofR05lzTBKafeSKlhR1QDDuxo80R6Eq+H75 ZYB+8xmAGo9eOs5HmdOmYYD4ZZ//ZP3ypDGtYfvEIlyXHU6zOtEen/CoVPyBWfvW +2xhHw1lWfQdk5v3uHPivrC3VqGI2rdMthiG/6XLeq8smLsg== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frpgk0ear-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:29:02 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c1c7f135bso12068891cf.0 for ; Fri, 31 Jul 2026 01:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785486542; x=1786091342; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=xxXBjOQaVivJJP+m3lH/e6Blj4o5INx0Tg6Ob2u8pnA=; b=a8sFxIC0cHBuk1MlyhEXs42JWFbxWMqkvKR6grwRAtcE35QECF/pHuq35eRftVVbQg ssMV6BeLMH+a8SSWXfHMuWlXPFnsoCp3j8BO4iTxXgq56Zgw5LbolfxUyeCRP48/nbhr gQe7j22yZPDQWviQ9JNuRPjLp5NYX32ANMnI0hzcx8M7bIcygkMFIvAe4HhtuoRxkmML LCofJcp0afO6O5iiKjbT6X7/GV3h5obihikOOdVpTdBEPKN86Vg831PNHhQSHmUgojhE dHzaZFEtEqO31arwfBdanzoAh+gc4LF9gRMlQBMzfw44R5hYWlnUVdIPuBdg4SBThu3g WQdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785486542; x=1786091342; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=xxXBjOQaVivJJP+m3lH/e6Blj4o5INx0Tg6Ob2u8pnA=; b=qaQRm1lHzIYIxxnF+iRzrTXPNXDu7/g4RdEFYmSvfAUkEOsN2YzUxYOxlFHY9yGgjz 2+oNTjwFuevCPQ+uP/q0o2Z4adDVdAaNFfC0q4ozS1A3vTrJg7ywX+vgR5oMW1LlOhil Xs/R5EfQ8ssbVWjy2/zJqvgi5J6dbBg/MsSFoJ8J7rnaG/mScnrwbCuCYkltp3K3GxUO p7ElePBGOAY1QZeHbhKwLWPRfYGKwZwGREwbfd6PZtBOuggn/HiwS0q7MgWXjRyT6eAu UKzpa3DI/MVeBprE9emXtKV45m13JQOq8j4HH5w8ZmRTH5qEoztVft+GwK14OmZqE/x9 SYJg== X-Forwarded-Encrypted: i=1; AHgh+Rqwm/dbP4AJHalzW4DytClm4BjvttrZCMMtOrzPLWE7YCGVbLHqPNZf/Y7avNBIpyQE4zLWrhT5+y3o23o=@vger.kernel.org X-Gm-Message-State: AOJu0YxM06mOJiq3pWVeW3YIYM9qXqcY9eMloL6zYDnZb3d7GF+ZMoB3 IhFnwCU9TOfUml/GRRRxRy/Tzp4FBc3oxs7i8LaUKmF9bkseF6RUfROS6eOv120c6CFclmo963/ ow5nF9ha9NuNLSFXDzvB/kbXdhiHk6ok8jPg1LJy+0zmAYx4f1K1H4afpLHPwhOPii0U= X-Gm-Gg: AR+sD12nuz/s9QPQAeaAOXWYan68W3NWuwh0KHLzIo4r51KcYncPeqbit30HwVfxkHc 36sHRGsuBWdc6Rmsmm0a0lxoeKgEEvblrDELXmwo2nnEC2QC1JWRLG3Pogs0GjlZpF1HwvEzz43 CyYBbq6C0wkQVq8rzo6krrTGK+Ed+EP7sTSvHNcv+JoxVc7KpkD2MR0RwFaPnkwEa92MeykCTUT 1R39CqxG4fZxBJ8x9Rm4HTQ0VpcfBkQVSrwSCWQuIuznfpJ6KjYfuOre70ei4YwLhQMPblRgR2T 8vAfYJgjTmQsFvmMGDVvbbneAY1loSyJKu9kvjpONpx1GrNEemDCX2kbhIzCnvdjfgDa7B+I2qH jEKmXXtfeuaKzNVwhmJiwfmz/FWfUog== X-Received: by 2002:a05:622a:6093:b0:51b:fd82:22dd with SMTP id d75a77b69052e-52b4af3e60bmr13993121cf.15.1785486541594; Fri, 31 Jul 2026 01:29:01 -0700 (PDT) X-Received: by 2002:a05:622a:6093:b0:51b:fd82:22dd with SMTP id d75a77b69052e-52b4af3e60bmr13992841cf.15.1785486541160; Fri, 31 Jul 2026 01:29:01 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd3c90f52sm66412266b.16.2026.07.31.01.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:29:00 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:28:50 +0200 Subject: [PATCH v2] power: sequencing: rename pwrseq_power_on/off() to pwrseq_enable/disable() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-pwrseq-vote-rename-v2-1-480357946e00@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAMFcbGoC/32NTQ6CMBCFr0Jm7ZC2xlZdcQ/DopZRmgiFDlYN6 d2tHMDNS76X97MCU/TEcK5WiJQ8+zAWULsKXG/HO6HvCoMSSgujDE6vyDRjCgthpNEOhFfjOiX FXml9hFKcIt38exu9tIV7z0uIn+0jyZ/7dy5JlGhL4mSJrNOHJjDX89M+XBiGugi0OecvQ5Id4 bsAAAA= X-Change-ID: 20260727-pwrseq-vote-rename-b7cd21032668 To: Bartosz Golaszewski , Jonathan Corbet , Shuah Khan , Marcel Holtmann , Luiz Augusto von Dentz , Alessio Belle , Luigi Santivetti , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeff Johnson , Manivannan Sadhasivam , Bjorn Helgaas , Chen-Yu Tsai , Loic Poulain Cc: linux-pm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, imagination@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, linux-pci@vger.kernel.org, Jeff Johnson , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11617; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=1GlGb33gRFeu0ldp5kUwM7ApHq+RZYDeUNAyNeeeQn8=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFzFJt6O8wisou3BKsioXgAk/mjF1g90Iazw4 Q+GK32nk4WJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxcxQAKCRAFnS7L/zaE w5KiD/9uG0pyhUUSXNyne3ZBbn/ozYp9Z/b8T3f++gwk55/CBAUPOmX2LtavoIZR4mMmKoIubHQ CgOycHiDpbS8ci6fYmDKLOQAE9NsVYGIn94H6/bCf/FjcCwHgf5qsoCSadZSpPkSexsmLTgmNn2 37xmxDx1e6dmukUv3P0INHQPENmbUC2vv3k9SEGdXfiT61tI35vJpW/S5wbTzFwU8YMeW/rFz4b I7GafpAu+h2W39O3kaFwzNSiDQ0JG7dFUWR/HqA0zxzKaf1k2LgscpgJ7bFP5P3Cw9Bmj1IJ0R2 Hi2etbbfqkMkXtIwB0E17PCl77rDRYvBPSudQ2wamrrNNCEy6Qjclz/HJl8MXzXUeQPGVIGQ9jZ M0IDAV2EVtfXqecbzeghxirJ6F3VX3ogfRoITkcPyx+PBTYbuCDAZapLb8rdk+AlE3jSnjpGXtC ln3DCt10POHURDM5TAUlnSta0cHg01EDOqzu+JbtT/JexL+ZTeHUpe7a26j8y6UC5Ht0NnqW0bs OFZeV5fgIa5QgWJROY77j3rgqUSDOEMycs+b7kXPS0WskKCMkZ5ntraOM63MbzcFsJ7hdWTzMGm QHCctpTrQZeHX1/x/CrVjqgwC8J1UeBkVUvpQnbVti2h3uQtq+5IXhc05rdo/GdrTibeOfP/BAx mGO/h5vwIDjrlWw== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-ORIG-GUID: f4LOsUHMrmUBPF-BMMOikjxg-jWDpCQ6 X-Authority-Analysis: v=2.4 cv=P4sKQCAu c=1 sm=1 tr=0 ts=6a6c5cce cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=bC-a23v3AAAA:8 a=EUspDBNiAAAA:8 a=1XWaLZrsAAAA:8 a=RTdnRIbMq3CNlSfCOOQA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=FO4_E8m0qiDe52t0p3_H:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA2MCBTYWx0ZWRfX4PTfgmpqlEH5 CxgOx1GpL+9BjivI3KceMHW8zuypCbBXgQtZhZXe+2YbwxmgtAx1153hCIJ3vetpLGUlAdY09DW oNJBK4ZfaRlY9b49LSdSX7yj21iHeik= X-Proofpoint-GUID: f4LOsUHMrmUBPF-BMMOikjxg-jWDpCQ6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA2MCBTYWx0ZWRfX+rb6yYp+ZD9H c/fJmBfN3OhnNS2KMaZzCRTGypLBnNgG9+qUeyG/u3m0swEmh+YX75BE/gvDAWuv3X5YtrplCR1 njvJAot2u21BbFy3OVNsedp9PWG6JZUX5VSrX5QOjwpNj7MHW9jrpOTbf6bQ6dWe9dRjs5fBOwW dWY6FuQ/3KUTXYfqZUxsbRmjWDVjIsvSgiJ7cj8TvYblQTzRkbN2Sd1ColRjvuttewz0bLhDETT hXR8RrWehSb1boBWpnlPeQpJjjOSbFSaco0tA8y7p+iHYwYCvFBZbR3ktMvKHUPZptz4OMgHDsF YI2BMFAm4dePGlhvdQshroDCRDYjzVnsNdAJjFPsK019P5G2SnVl3BGXGrqgWkFeiwV/8hYoSbM x3+XRyv2PRl66RWzLL4PpEuNzTMBvG7UK6y07O5eH5Ka+4ryqig47XOAgRzg2Ub2fhgJR4i2eGa k/v95RLyzcE1ImcUxHw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 spamscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310060 The way power sequencing works means that a call to pwrseq_power_on() does not necessarily result in the pwrseq target being powered-on at that time: it may have already been powered on before. Similarly: a call to pwrseq_power_off() does not have to result in an actual powering off of resources: there may still be other users that requested a power-on before. We will also introduce the concept of "non-controllable" pwrseq targets soon which further increases the disconnect between the naming convention and the actual semantics. What consumers of pwrseq descriptors actually do is: they *vote* for a powering on of a given target or retract that vote. These operations could be called get/put in line with runtime PM but this could become confusing since we already provide pwrseq_get/put() for a different purpose. pwrseq_vote_on/off() also have been rejected as unusual in the tree. Change the name of the two functions to pwrseq_enable/disable() which better reflects their purpose and semantics and also mirrors other enable-counted resources like regulators and clocks. No functional change intended. If at any point users need to know *when* the exact power event happens, we can provide that information in the form of a notifier. Acked-by: Jeff Johnson Acked-by: Bjorn Helgaas Signed-off-by: Bartosz Golaszewski --- I've floated the idea to rename the two pwrseq functions from "power on/off" to "vote on/off". I've sent a patch but the overwhelming consensus seem to be that enable/disable naming is preferred. I'm doing it in a single commit that should go through the pwrseq tree with Acks from subsystem maintainers. [1] https://lore.kernel.org/all/CAMRc=3DMefxn81d0VUwmQgwFtffkL1=3DEr_1VQZCb= C1Sa-Qph4t1w@mail.gmail.com/ --- Changes in v2: - Change the naming convention to enable/disable - Link to v1: https://patch.msgid.link/20260727-pwrseq-vote-rename-v1-1-a20= 29aeeac65@oss.qualcomm.com --- Documentation/driver-api/pwrseq.rst | 4 ++-- drivers/bluetooth/hci_qca.c | 4 ++-- drivers/gpu/drm/imagination/pvr_power.c | 4 ++-- drivers/net/wireless/ath/ath10k/snoc.c | 6 +++--- drivers/pci/pwrctrl/generic.c | 4 ++-- drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c | 4 ++-- drivers/power/sequencing/core.c | 16 ++++++++-------- include/linux/pwrseq/consumer.h | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Documentation/driver-api/pwrseq.rst b/Documentation/driver-api= /pwrseq.rst index ad18b2326b689a41471216f3889480b11768ca82..0c315ab1138b02540fae60b3992= 8c580027c0f7c 100644 --- a/Documentation/driver-api/pwrseq.rst +++ b/Documentation/driver-api/pwrseq.rst @@ -50,9 +50,9 @@ Consumer interface The consumer API is aimed to be as simple as possible. The driver interest= ed in getting a descriptor from the power sequencer should call pwrseq_get() and specify the name of the target it wants to reach in the sequence after cal= ling -pwrseq_power_up(). The descriptor can be released by calling pwrseq_put() = and +pwrseq_enable(). The descriptor can be released by calling pwrseq_put() and the consumer can request the powering down of its target with -pwrseq_power_off(). Note that there is no guarantee that pwrseq_power_off() +pwrseq_disble(). Note that there is no guarantee that pwrseq_disble() will have any effect as there may be multiple users of the underlying reso= urces who may keep them active. =20 diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 345f602e9ce233a0934a73a85d1e7c17c4f3210d..e713fc06b73402ae3d57794ed08= 70df8394a796a 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2259,7 +2259,7 @@ static void qca_power_off(struct hci_uart *hu) } =20 if (power && power->pwrseq) { - pwrseq_power_off(power->pwrseq); + pwrseq_disble(power->pwrseq); set_bit(QCA_BT_OFF, &qca->flags); return; } @@ -2319,7 +2319,7 @@ static int qca_regulator_enable(struct qca_serdev *qc= adev) int ret; =20 if (power->pwrseq) - return pwrseq_power_on(power->pwrseq); + return pwrseq_enable(power->pwrseq); =20 /* Already enabled */ if (power->vregs_on) diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imag= ination/pvr_power.c index a71d5b35601e7b996428312028a4c0542a5b1350..031fad8adf4f4843e852000d3d6= ba45d0e4b0aeb 100644 --- a/drivers/gpu/drm/imagination/pvr_power.c +++ b/drivers/gpu/drm/imagination/pvr_power.c @@ -352,12 +352,12 @@ static int pvr_power_init_pwrseq(struct pvr_device *p= vr_dev) =20 static int pvr_power_on_sequence_pwrseq(struct pvr_device *pvr_dev) { - return pwrseq_power_on(pvr_dev->pwrseq); + return pwrseq_enable(pvr_dev->pwrseq); } =20 static int pvr_power_off_sequence_pwrseq(struct pvr_device *pvr_dev) { - return pwrseq_power_off(pvr_dev->pwrseq); + return pwrseq_disble(pvr_dev->pwrseq); } =20 const struct pvr_power_sequence_ops pvr_power_sequence_ops_pwrseq =3D { diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/= ath/ath10k/snoc.c index 3106502275781d32d17a45a661362206144df6b3..d7e23971fe1da99f6b5f7559d62= d04e2044d8950 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -1025,7 +1025,7 @@ static int ath10k_hw_power_on(struct ath10k *ar) =20 ath10k_dbg(ar, ATH10K_DBG_SNOC, "soc power on\n"); =20 - ret =3D pwrseq_power_on(ar_snoc->pwrseq); + ret =3D pwrseq_enable(ar_snoc->pwrseq); if (ret) return ret; =20 @@ -1042,7 +1042,7 @@ static int ath10k_hw_power_on(struct ath10k *ar) vreg_off: regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs); pwrseq_off: - pwrseq_power_off(ar_snoc->pwrseq); + pwrseq_disble(ar_snoc->pwrseq); =20 return ret; } @@ -1060,7 +1060,7 @@ static int ath10k_hw_power_off(struct ath10k *ar) ret_vreg =3D regulator_bulk_disable(ar_snoc->num_vregs, ar_snoc->vregs); =20 if (ar_snoc->pwrseq) - ret_seq =3D pwrseq_power_off(ar_snoc->pwrseq); + ret_seq =3D pwrseq_disble(ar_snoc->pwrseq); =20 return ret_vreg ? : ret_seq; } diff --git a/drivers/pci/pwrctrl/generic.c b/drivers/pci/pwrctrl/generic.c index a7e599d841e6289db161b19a93ba5a61d9e0ab1c..d366883355173eac1a2631b73e5= e041666ac23ad 100644 --- a/drivers/pci/pwrctrl/generic.c +++ b/drivers/pci/pwrctrl/generic.c @@ -29,7 +29,7 @@ static int slot_pwrctrl_power_on(struct pci_pwrctrl *pwrc= trl) int ret; =20 if (slot->pwrseq) { - pwrseq_power_on(slot->pwrseq); + pwrseq_enable(slot->pwrseq); return 0; } =20 @@ -48,7 +48,7 @@ static int slot_pwrctrl_power_off(struct pci_pwrctrl *pwr= ctrl) struct slot_pwrctrl, pwrctrl); =20 if (slot->pwrseq) { - pwrseq_power_off(slot->pwrseq); + pwrseq_disble(slot->pwrseq); return 0; } =20 diff --git a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c b/drivers/pci/pwrctrl= /pci-pwrctrl-pwrseq.c index a308bf4b5fc01d23b75db4cd396201c3ba3fe695..2a6f46f6e2012dd985b657c97c8= 5879ba13b5133 100644 --- a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c +++ b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c @@ -56,7 +56,7 @@ static int pwrseq_pwrctrl_power_on(struct pci_pwrctrl *pw= rctrl) struct pwrseq_pwrctrl *pwrseq =3D container_of(pwrctrl, struct pwrseq_pwrctrl, pwrctrl); =20 - return pwrseq_power_on(pwrseq->pwrseq); + return pwrseq_enable(pwrseq->pwrseq); } =20 static int pwrseq_pwrctrl_power_off(struct pci_pwrctrl *pwrctrl) @@ -64,7 +64,7 @@ static int pwrseq_pwrctrl_power_off(struct pci_pwrctrl *p= wrctrl) struct pwrseq_pwrctrl *pwrseq =3D container_of(pwrctrl, struct pwrseq_pwrctrl, pwrctrl); =20 - return pwrseq_power_off(pwrseq->pwrseq); + return pwrseq_disble(pwrseq->pwrseq); } =20 static int pwrseq_pwrctrl_probe(struct platform_device *pdev) diff --git a/drivers/power/sequencing/core.c b/drivers/power/sequencing/cor= e.c index 02f42da915985339d3de507fc36dd158b0035a99..34d5c0af6f37bdbfa9d656d9579= 5d38cc7e38762 100644 --- a/drivers/power/sequencing/core.c +++ b/drivers/power/sequencing/core.c @@ -708,7 +708,7 @@ void pwrseq_put(struct pwrseq_desc *desc) pwrseq =3D desc->pwrseq; =20 if (desc->powered_on) - pwrseq_power_off(desc); + pwrseq_disble(desc); =20 kfree(desc); module_put(pwrseq->owner); @@ -874,7 +874,7 @@ static int pwrseq_unit_disable(struct pwrseq_device *pw= rseq, } =20 /** - * pwrseq_power_on() - Issue a power-on request on behalf of the consumer + * pwrseq_enable() - Issue a power-on request on behalf of the consumer * device. * @desc: Descriptor referencing the power sequencer. * @@ -887,7 +887,7 @@ static int pwrseq_unit_disable(struct pwrseq_device *pw= rseq, * Returns: * 0 on success, negative error number on failure. */ -int pwrseq_power_on(struct pwrseq_desc *desc) +int pwrseq_enable(struct pwrseq_desc *desc) { struct pwrseq_device *pwrseq; struct pwrseq_target *target; @@ -925,14 +925,14 @@ int pwrseq_power_on(struct pwrseq_desc *desc) =20 return ret; } -EXPORT_SYMBOL_GPL(pwrseq_power_on); +EXPORT_SYMBOL_GPL(pwrseq_enable); =20 /** - * pwrseq_power_off() - Issue a power-off request on behalf of the consumer + * pwrseq_disble() - Issue a power-off request on behalf of the consumer * device. * @desc: Descriptor referencing the power sequencer. * - * This undoes the effects of pwrseq_power_on(). It issues a power-off req= uest + * This undoes the effects of pwrseq_enable(). It issues a power-off reque= st * on behalf of the consumer and when the last remaining user does so, the * power-down sequence will be started. If one is in progress, the function * will block until it's complete and then return. @@ -940,7 +940,7 @@ EXPORT_SYMBOL_GPL(pwrseq_power_on); * Returns: * 0 on success, negative error number on failure. */ -int pwrseq_power_off(struct pwrseq_desc *desc) +int pwrseq_disble(struct pwrseq_desc *desc) { struct pwrseq_device *pwrseq; struct pwrseq_unit *unit; @@ -966,7 +966,7 @@ int pwrseq_power_off(struct pwrseq_desc *desc) =20 return ret; } -EXPORT_SYMBOL_GPL(pwrseq_power_off); +EXPORT_SYMBOL_GPL(pwrseq_disble); =20 /** * pwrseq_to_device() - Get the pwrseq device pointer from a descriptor. diff --git a/include/linux/pwrseq/consumer.h b/include/linux/pwrseq/consume= r.h index 3c907c9e1885dc2958043a9a733fbe20bdf95f6e..5e94b0b9c38b036fc40e3e2c8c6= e1020d0d0bb6e 100644 --- a/include/linux/pwrseq/consumer.h +++ b/include/linux/pwrseq/consumer.h @@ -20,8 +20,8 @@ void pwrseq_put(struct pwrseq_desc *desc); struct pwrseq_desc * __must_check devm_pwrseq_get(struct device *dev, const char *target); =20 -int pwrseq_power_on(struct pwrseq_desc *desc); -int pwrseq_power_off(struct pwrseq_desc *desc); +int pwrseq_enable(struct pwrseq_desc *desc); +int pwrseq_disble(struct pwrseq_desc *desc); =20 struct device *pwrseq_to_device(struct pwrseq_desc *desc); =20 @@ -43,12 +43,12 @@ devm_pwrseq_get(struct device *dev, const char *target) return ERR_PTR(-ENOSYS); } =20 -static inline int pwrseq_power_on(struct pwrseq_desc *desc) +static inline int pwrseq_enable(struct pwrseq_desc *desc) { return -ENOSYS; } =20 -static inline int pwrseq_power_off(struct pwrseq_desc *desc) +static inline int pwrseq_disble(struct pwrseq_desc *desc) { return -ENOSYS; } --- base-commit: 95d6a9ccef99117115e41e9adb271243bd5e985b change-id: 20260727-pwrseq-vote-rename-b7cd21032668 Best regards, --=20 Bartosz Golaszewski