Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1317333

[PATCH 3/3] tty: hvc_xen: hide xen_console_remove when unused

Show all headers | View raw

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>
---
 drivers/tty/hvc/hvc_xen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index fa816b7193b6..11725422dacb 100644
--- 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 xencons_info *info)
 	return 0;
 }
 
-#ifdef CONFIG_HVC_XEN_FRONTEND
 static int xencons_remove(struct xenbus_device *dev)
 {
 	return xen_console_remove(dev_get_drvdata(&dev->dev));
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] tty: nozomi: avoid a harmless gcc warning Arnd Bergmann <arnd@arndb.de> - 2016-01-25 23:00 +0100
  [PATCH 3/3] tty: hvc_xen: hide xen_console_remove when unused Arnd Bergmann <arnd@arndb.de> - 2016-01-25 23:00 +0100
    Re: [PATCH 3/3] tty: hvc_xen: hide xen_console_remove when unused Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-01-26 00:10 +0100
      Re: [PATCH 3/3] tty: hvc_xen: hide xen_console_remove when unused Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2016-01-26 13:30 +0100
  [PATCH 2/3] tty: cyclades: cyz_interrupt is only used for PCI Arnd Bergmann <arnd@arndb.de> - 2016-01-25 23:00 +0100

csiph-web