lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 101/193] tty: hvc_xen: hide xen_console_remove when unused
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit e36ae3439936e13c33f5841c7c2c1a9875acbb6d upstream.

    xencons_disconnect_backend() is only called from xen_console_remove(),
    which is conditionally compiled, so we get a harmless warning when
    CONFIG_HVC_XEN_FRONTEND is unset:

    hvc/hvc_xen.c:350:12: error: 'xen_console_remove' defined but not used [-Werror=unused-function]

    This moves the function down into the same #ifdef section to silence
    the warning.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/hvc/hvc_xen.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/tty/hvc/hvc_xen.c
    +++ b/drivers/tty/hvc/hvc_xen.c
    @@ -323,6 +323,7 @@ void xen_console_resume(void)
    }
    }

    +#ifdef CONFIG_HVC_XEN_FRONTEND
    static void xencons_disconnect_backend(struct xencons_info *info)
    {
    if (info->irq > 0)
    @@ -363,7 +364,6 @@ static int xen_console_remove(struct xen
    return 0;
    }

    -#ifdef CONFIG_HVC_XEN_FRONTEND
    static int xencons_remove(struct xenbus_device *dev)
    {
    return xen_console_remove(dev_get_drvdata(&dev->dev));

    \
     
     \ /
      Last update: 2018-02-23 21:27    [W:2.328 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site