From nobody Sun Feb 8 21:12:39 2026 Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) (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 37BC716CD33 for ; Sat, 18 Jan 2025 12:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737203073; cv=none; b=STw199qcI3VkridCxdqtyWmO4X7yuTjI7BXDJzaKIql+k24NtXH8/X8m7MYYlKTh8wpZsjhsn8NprUagOshBXgsrmeoFvlSu28JNYRZM4aj9Fxr8D/JQ3uT7CnXtRUHs73frP1VdLPkCFB+nXJKC+fFIQ1JwOjjZd9VqEo0oIn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737203073; c=relaxed/simple; bh=Q+dKwlAgfJR/L2LcGcl6V4jocS04iT3hVBlahHbjwjM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OewJuv7PjmQPp5d5d2eK6X++D/J8XrqD/a9zASxVUPm5fwjLujTuR0gR3BnNnXMfR2hsDXqsqOHU4HDVY+dWLqOB/WxraY0yKUVkFpoyyGaZMzo30YkyCzwzuAWqBgUMR38G5kqvLKtY0TNuVkbrr07KlWbOelLibJu/V7s2DBg= 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=oKmT7jr5; arc=none smtp.client-ip=44.202.169.39 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="oKmT7jr5" Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id Z6Kutiiw5dz4NZ7sFtMQOq; Sat, 18 Jan 2025 12:24:23 +0000 Received: from box5620.bluehost.com ([162.241.219.59]) by cmsmtp with ESMTPS id Z7sEtiDgLLtLmZ7sEtL8oM; Sat, 18 Jan 2025 12:24:22 +0000 X-Authority-Analysis: v=2.4 cv=a9M291SF c=1 sm=1 tr=0 ts=678b9d76 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=Mh2R0G2cJzYgeWqV9WhHZXx2WksjUEpSn9CcW1gfxZc=; b=oKmT7jr5zQZ/xyYsjgEZVlc/69 4y3mFmMjWGylZ3r6jJYaK+InscEQ/pCwm6E5JTcCT08nYCRIfqFCAjAtSb/5XfrlTDqSUEe1qteQm DWyZxyjn+EcfgS/ssIIro76O1KuOPK+TJDv8BOW8FOf+Elvb6ZNyfq9999f1S7nxsmDYbzHP8n4LO RPdeF3nZ0NvAdbGe0V8x+oAyRiKsz5bDHbbCtIGkUxKmvZ4WdN5e1cv2J7W84bEOOYjLEKSEwaVbc KJH9la3duxbyIQsmX1k5nMObVRU2S/lc8PgVLjnFCP90AcLLBDqjLXw+2ciHtDbjErWzV+E//KLOi vaoYuwug==; Received: from c-73-223-253-157.hsd1.ca.comcast.net ([73.223.253.157]:41512 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 1tZ7sD-001HzA-39; Sat, 18 Jan 2025 05:24:22 -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:24:09 -0800 Message-ID: <20250118122409.4052121-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: 1tZ7sD-001HzA-39 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]:41512 X-Source-Auth: re@w6rz.net X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: d3NpeHJ6bmU7d3NpeHJ6bmU7Ym94NTYyMC5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfG/ZrUthsAcQc2ZQuLrKkY5pZk/sqFx9Wx4px43rXU/WcTT6xBnZcFCKDMC59gi0H0H5YrG7Xmxz/LkIWf6ogrya8dXqppj0uEHz1HH8UpxvXtaF0yJV tc0pza03VWi0B5a+FS9NB1+zXXD63kxA3TwYwMdUtbczpHHIGpnbMLYj9NUz94S1fkrqIlXp99f5jgs0CXa1hoP2pBdr0HBFtcw= Content-Type: text/plain; charset="utf-8" commit 9734fd7a27772016b1f6e31a03258338a219d7d6 This fixes the build when CONFIG_PM is not set Signed-off-by: Ron Economos Reported-by: Guenter Roeck --- 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