Commit f1691276 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

tty: hvc_xen: hide xen_console_remove when unused

commit e36ae343 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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86f630e5
...@@ -323,6 +323,7 @@ void xen_console_resume(void) ...@@ -323,6 +323,7 @@ void xen_console_resume(void)
} }
} }
#ifdef CONFIG_HVC_XEN_FRONTEND
static void xencons_disconnect_backend(struct xencons_info *info) static void xencons_disconnect_backend(struct xencons_info *info)
{ {
if (info->irq > 0) if (info->irq > 0)
...@@ -363,7 +364,6 @@ static int xen_console_remove(struct xencons_info *info) ...@@ -363,7 +364,6 @@ static int xen_console_remove(struct xencons_info *info)
return 0; return 0;
} }
#ifdef CONFIG_HVC_XEN_FRONTEND
static int xencons_remove(struct xenbus_device *dev) static int xencons_remove(struct xenbus_device *dev)
{ {
return xen_console_remove(dev_get_drvdata(&dev->dev)); return xen_console_remove(dev_get_drvdata(&dev->dev));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment