linux-next: build failure after merge of the usb tree

linux-next: build failure after merge of the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Hi all,

After merging the usb tree, today's linux-next build (s390 allmodconfig)
failed like this:

drivers/usb/host/xhci-pci.c:91:13: error: 'xhci_msix_sync_irqs' defined but not used [-Werror=unused-function]

(reported here: http://kisskb.ellerman.id.au/kisskb/buildresult/14902506/)

Caused by commit

  9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")

The function is only called if CONFIG_PM is set, but defined
unconditionally.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the usb tree

[Greg KH]

On Mon, Mar 27, 2023 at 04:02:32PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the usb tree, today's linux-next build (s390 allmodconfig)
> failed like this:
> 
> drivers/usb/host/xhci-pci.c:91:13: error: 'xhci_msix_sync_irqs' defined but not used [-Werror=unused-function]
> 
> (reported here: http://kisskb.ellerman.id.au/kisskb/buildresult/14902506/)
> 
> Caused by commit
> 
>   9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")
> 
> The function is only called if CONFIG_PM is set, but defined
> unconditionally.

Ick.  Mathias, can you make up a patch for this?

thanks,

greg k-h

[PATCH] xhci: only define xhci_msix_sync_irqs() when CONFIG_PM is set

[Mathias Nyman]

xhci_msic_sync_irqs() function is only called during suspend, when
CONFIG_PM is set, so don't define it unconditionally.

Fixes: 9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/host/xhci-pci.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index a53ecc8ff8c5..1e826a159b96 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -88,19 +88,6 @@ static const struct xhci_driver_overrides xhci_pci_overrides __initconst = {
 	.update_hub_device = xhci_pci_update_hub_device,
 };
 
-static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
-{
-	struct usb_hcd *hcd = xhci_to_hcd(xhci);
-
-	if (hcd->msix_enabled) {
-		struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
-		int i;
-
-		for (i = 0; i < xhci->msix_count; i++)
-			synchronize_irq(pci_irq_vector(pdev, i));
-	}
-}
-
 /* Free any IRQs and disable MSI-X */
 static void xhci_cleanup_msix(struct xhci_hcd *xhci)
 {
@@ -729,6 +716,20 @@ static void xhci_pci_remove(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
+
+static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
+{
+	struct usb_hcd *hcd = xhci_to_hcd(xhci);
+
+	if (hcd->msix_enabled) {
+		struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
+		int i;
+
+		for (i = 0; i < xhci->msix_count; i++)
+			synchronize_irq(pci_irq_vector(pdev, i));
+	}
+}
+
 /*
  * In some Intel xHCI controllers, in order to get D3 working,
  * through a vendor specific SSIC CONFIG register at offset 0x883c,
-- 
2.25.1

Re: [PATCH] xhci: only define xhci_msix_sync_irqs() when CONFIG_PM is set

[Greg KH]

On Mon, Mar 27, 2023 at 01:31:03PM +0300, Mathias Nyman wrote:
> xhci_msic_sync_irqs() function is only called during suspend, when
> CONFIG_PM is set, so don't define it unconditionally.
> 
> Fixes: 9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")
> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
> ---
>  drivers/usb/host/xhci-pci.c | 27 ++++++++++++++-------------
>  1 file changed, 14 insertions(+), 13 deletions(-)

No linux-usb?

Re: [PATCH] xhci: only define xhci_msix_sync_irqs() when CONFIG_PM is set

[Mathias Nyman]

On 27.3.2023 15.02, Greg KH wrote:
> On Mon, Mar 27, 2023 at 01:31:03PM +0300, Mathias Nyman wrote:
>> xhci_msic_sync_irqs() function is only called during suspend, when
>> CONFIG_PM is set, so don't define it unconditionally.
>>
>> Fixes: 9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")
>> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
>> ---
>>   drivers/usb/host/xhci-pci.c | 27 ++++++++++++++-------------
>>   1 file changed, 14 insertions(+), 13 deletions(-)
> 
> No linux-usb?
> 

Oh, right, linux-usb was missing.
Now sent there separately as well

Thanks
Mathias