lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] usb: xhci: Mark two functions __maybe_unused
    Date
    Resolves the following build warnings:
    drivers/usb/host/xhci.c:332:13: warning: 'xhci_msix_sync_irqs' defined but not used [-Wunused-function]
    drivers/usb/host/xhci.c:3901:12: warning: 'xhci_change_max_exit_latency' defined but not used [-Wunused-function]

    These functions are not always used, and since they're marked static
    they will produce build warnings:
    - xhci_msix_sync_irqs is only used with CONFIG_PCI.
    - xhci_change_max_exit_latency is a little more complicated with
    dependencies on CONFIG_PM and CONFIG_PM_RUNTIME.

    Instead of building a bigger maze of ifdefs in this code, I've just
    marked both with __maybe_unused.

    Signed-off-by: Olof Johansson <olof@lixom.net>
    ---

    Sarah,

    I guess taste might differ on ifdef vs __maybe_unused, let me know this
    is not to your liking.

    Thanks,

    -Olof

    drivers/usb/host/xhci.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
    index 2c49f00..87ae8cd 100644
    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -329,7 +329,7 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)
    return;
    }

    -static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
    +static void __maybe_unused xhci_msix_sync_irqs(struct xhci_hcd *xhci)
    {
    int i;

    @@ -3898,7 +3898,7 @@ int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1)
    * Issue an Evaluate Context command to change the Maximum Exit Latency in the
    * slot context. If that succeeds, store the new MEL in the xhci_virt_device.
    */
    -static int xhci_change_max_exit_latency(struct xhci_hcd *xhci,
    +static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
    struct usb_device *udev, u16 max_exit_latency)
    {
    struct xhci_virt_device *virt_dev;
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-07-23 21:41    [W:7.428 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site