From nobody Mon Feb 9 09:29:08 2026 Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) (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 518732B9BF for ; Sat, 18 Jan 2025 12:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737202620; cv=none; b=BlY28G0y4KlbsIKRyPpAPEvrWUAoJXO/as0anEHOMmqkyGXdgdIw51mTHQ4tmCvf54er1CERDmXtZ/5G+y/dpYpFo3T/lAJodHg1I+HUmmVDntSFYmIYETDOg1zPH6C6avQmwPQPtBQdWdWLAoIS+XkNunlEEzeLS6sY/F4XjZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737202620; c=relaxed/simple; bh=eWg61S/3Lo9Jw4Jtf0JuRHqAA4IfSdB9FH+nb9aQbuM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tqhEapf2COiUEW/HRAuTCCnNM+9YB/CnwNa9QTWgqmoAw1UNMTt0PxHaX05iUJMiigAzNvEHQm0uRFYWgucAzoF6dYtcgPfR+74jruLaOVZ0PXu6pdoGDEcIJYvcskS/vbjUhDhOQaV42ei/XX6wTC5+qKZNL/ThewKg0+Vd3qs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=w6rz.net; spf=pass smtp.mailfrom=w6rz.net; dkim=pass (2048-bit key) header.d=w6rz.net header.i=@w6rz.net header.b=anfoKGoF; arc=none smtp.client-ip=35.89.44.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=w6rz.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=w6rz.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=w6rz.net header.i=@w6rz.net header.b="anfoKGoF" Received: from eig-obgw-5004a.ext.cloudfilter.net ([10.0.29.221]) by cmsmtp with ESMTPS id Ym7ltDNAkqewVZ7jVtJVD4; Sat, 18 Jan 2025 12:15:21 +0000 Received: from box5620.bluehost.com ([162.241.219.59]) by cmsmtp with ESMTPS id Z7jUtsl2sWvXpZ7jUtFTIu; Sat, 18 Jan 2025 12:15:20 +0000 X-Authority-Analysis: v=2.4 cv=LtdZyWdc c=1 sm=1 tr=0 ts=678b9b58 a=30941lsx5skRcbJ0JMGu9A==:117 a=30941lsx5skRcbJ0JMGu9A==:17 a=VdSt8ZQiCzkA:10 a=7vwVE5O1G3EA:10 a=HaFmDPmJAAAA:8 a=SlZi4aQT4Pts4r2Ut8gA:9 a=nmWuMzfKamIsx3l42hEX:22 a=hTR6fmoedSdf3N0JiVF8:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=w6rz.net; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jNEHRUiV3KsXEr2fffS1na4/pVSuMmZ2MnReCt+KGdE=; b=anfoKGoFdfSgknU/iGJ9Xgt9Ji ZTatkcW+nAJsnU0sV3PTKYvY3onABZCa6VDZtQDryzL/MmpqSuM4DBEb51QZgpiclmjJ3liYBFyod uF7pQbnhZv/G3mooqG1BQdKdJcp5i4N0fouJkxu9AsKz0wmV8PA7F+sQU2xeinkrXb7Yb2xfZLWr6 50NHutpnAfohLnbn10gxx02qzMD8tDcAWuTOekm/ItgfQEJZB7OX1CHpNpTL9OreHLE+PQwu8lpJ1 TJV23Ylm0acgcfqWa5nqCvnZjE4p4OSBF2muGaA76nTgdelt3WTjNETBg99sBiyAKn/MdTtPeSpvu m92cJBFA==; Received: from c-73-223-253-157.hsd1.ca.comcast.net ([73.223.253.157]:48288 helo=beavis.silicon) by box5620.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1tZ7jT-001E1E-1l; Sat, 18 Jan 2025 05:15:19 -0700 From: Ron Economos To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: Pavel Machek , linux-kernel@vger.kernel.org, Ron Economos Subject: [PATCH 6.1] Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals Date: Sat, 18 Jan 2025 04:15:05 -0800 Message-ID: <20250118121505.4052080-1-re@w6rz.net> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5620.bluehost.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - w6rz.net X-BWhitelist: no X-Source-IP: 73.223.253.157 X-Source-L: No X-Exim-ID: 1tZ7jT-001E1E-1l X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: c-73-223-253-157.hsd1.ca.comcast.net (beavis.silicon) [73.223.253.157]:48288 X-Source-Auth: re@w6rz.net X-Email-Count: 1 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: d3NpeHJ6bmU7d3NpeHJ6bmU7Ym94NTYyMC5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfE+uU67u+mUd/KTeTv9E25RXzHhGuToR/TDNIcJhlzDdF5iyD14LM8MYoALjCrxJ8S1XVS96QUzJ3EcP/a8f5jWRlirRzTUEpKAZGQKeMPafcy/4Qxgo 4D/Y6GQ3O8107Y8EBSPtTw01Kfu0XGcudQthH3eVTNxuuJWPXcyswTqfbN5/xhjf6zRMR2E3//UN3zG+ST3m3XV+zKLgnYJO3R4= Content-Type: text/plain; charset="utf-8" This fixes the build when CONFIG_PM is not set Signed-off-by: Ron Economos --- drivers/usb/host/xhci-pci.c | 8 +++++++- include/linux/usb/hcd.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 1d71e8ef9919..2ff049e02326 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -571,6 +571,7 @@ static void xhci_pci_remove(struct pci_dev *dev) pci_set_power_state(dev, PCI_D3hot); } =20 +#ifdef CONFIG_PM /* * In some Intel xHCI controllers, in order to get D3 working, * through a vendor specific SSIC CONFIG register at offset 0x883c, @@ -720,6 +721,7 @@ static void xhci_pci_shutdown(struct usb_hcd *hcd) if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) pci_set_power_state(pdev, PCI_D3hot); } +#endif /* CONFIG_PM */ =20 /*------------------------------------------------------------------------= -*/ =20 @@ -761,17 +763,21 @@ static struct pci_driver xhci_pci_driver =3D { /* suspend and resume implemented later */ =20 .shutdown =3D usb_hcd_pci_shutdown, +#ifdef CONFIG_PM .driver =3D { - .pm =3D pm_ptr(&usb_hcd_pci_pm_ops), + .pm =3D &usb_hcd_pci_pm_ops }, +#endif }; =20 static int __init xhci_pci_init(void) { xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides); +#ifdef CONFIG_PM xhci_pci_hc_driver.pci_suspend =3D xhci_pci_suspend; xhci_pci_hc_driver.pci_resume =3D xhci_pci_resume; xhci_pci_hc_driver.shutdown =3D xhci_pci_shutdown; +#endif return pci_register_driver(&xhci_pci_driver); } module_init(xhci_pci_init); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 575716d3672a..cd667acf6267 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -486,7 +486,9 @@ extern void usb_hcd_pci_shutdown(struct pci_dev *dev); =20 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev); =20 +#ifdef CONFIG_PM extern const struct dev_pm_ops usb_hcd_pci_pm_ops; +#endif #endif /* CONFIG_USB_PCI */ =20 /* pci-ish (pdev null is ok) buffer alloc/mapping support */ --=20 2.43.0