usb: host: xhci: sparse fixes

drivers/usb/host/xhci.c:1826:14: warning: symbol 'xhci_get_block_size' was not declared. Should it be static?
drivers/usb/host/xhci.c:1844:14: warning: symbol 'xhci_get_largest_overhead' was not declared. Should it be static?
drivers/usb/host/xhci-ring.c:2304:36: warning: context imbalance in 'handle_tx_event' - unexpected unlock
drivers/usb/host/xhci-hub.c:425:6: warning: symbol 'xhci_set_remote_wake_mask' was not declared. Should it be static?

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 630e9e6e06b5a92819005e3c4ea13a949abf336a..eb640d0ab32d11f9a7a41b8e1005d8c6299574c2 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -422,7 +422,7 @@ void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
        xhci_writel(xhci, temp, port_array[port_id]);
 }
 
-void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
+static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
                __le32 __iomem **port_array, int port_id, u16 wake_mask)
 {
        u32 temp;

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 700709cb41567ed57a1eed0265a34b1c20b7c4d0..37e23ed1fe1ea4ebb04e835d69737dd404aaac52 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2273,6 +2273,8 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
  */
 static int handle_tx_event(struct xhci_hcd *xhci,
                struct xhci_transfer_event *event)
+       __releases(&xhci->lock)
+       __acquires(&xhci->lock)
 {
        struct xhci_virt_device *xdev;
        struct xhci_virt_ep *ep;

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index b95e3e8a293eb9c5a5d6cf5e902d6f6799b1b127..66bc5c3985fb8dbaca5294492724e77070ca62d4 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1829,7 +1829,7 @@ static void xhci_finish_resource_reservation(struct xhci_hcd *xhci,
                                xhci->num_active_eps);
 }
 
-unsigned int xhci_get_block_size(struct usb_device *udev)
+static unsigned int xhci_get_block_size(struct usb_device *udev)
 {
        switch (udev->speed) {
        case USB_SPEED_LOW:
@@ -1847,7 +1847,8 @@ unsigned int xhci_get_block_size(struct usb_device *udev)
        }
 }
 
-unsigned int xhci_get_largest_overhead(struct xhci_interval_bw *interval_bw)
+static unsigned int
+xhci_get_largest_overhead(struct xhci_interval_bw *interval_bw)
 {
        if (interval_bw->overhead[LS_OVERHEAD_TYPE])
                return LS_OVERHEAD;