xhci: remove xhci_check_usb2_port_capability helper

This helper was only called from one function.
Removing it both reduces lines of code and made it more readable.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240429140245.3955523-3-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 7f07672d41106ba368db32d4097ec8b579086e0c..37eb37b0affa9c8c17a86b77801e998950c65bd7 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4507,26 +4507,13 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
        return 0;
 }
 
-/* check if a usb2 port supports a given extened capability protocol
- * only USB2 ports extended protocol capability values are cached.
- * Return 1 if capability is supported
- */
-static bool xhci_check_usb2_port_capability(struct xhci_hcd *xhci, int portnum,
-                                          unsigned capability)
-{
-       struct xhci_port *port;
-
-       port = xhci->usb2_rhub.ports[portnum];
-
-       return !!(port->port_cap->protocol_caps & capability);
-}
-
 static int xhci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
 {
        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-       int             portnum = udev->portnum - 1;
+       struct xhci_port *port;
+       u32 capability;
 
-       if (hcd->speed >= HCD_USB3 || !udev->lpm_capable)
+       if (hcd->speed >= HCD_USB3 || !udev->lpm_capable || !xhci->hw_lpm_support)
                return 0;
 
        /* we only support lpm for non-hub device connected to root hub yet */
@@ -4534,14 +4521,14 @@ static int xhci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
                        udev->descriptor.bDeviceClass == USB_CLASS_HUB)
                return 0;
 
-       if (xhci->hw_lpm_support == 1 &&
-                       xhci_check_usb2_port_capability(
-                               xhci, portnum, XHCI_HLC)) {
+       port = xhci->usb2_rhub.ports[udev->portnum - 1];
+       capability = port->port_cap->protocol_caps;
+
+       if (capability & XHCI_HLC) {
                udev->usb2_hw_lpm_capable = 1;
                udev->l1_params.timeout = XHCI_L1_TIMEOUT;
                udev->l1_params.besl = XHCI_DEFAULT_BESL;
-               if (xhci_check_usb2_port_capability(xhci, portnum,
-                                       XHCI_BLC))
+               if (capability & XHCI_BLC)
                        udev->usb2_hw_lpm_besl_capable = 1;
        }