On Mon, 25 Jan 2016, Boris Ostrovsky wrote:

On 01/25/2016 04:54 PM, Arnd Bergmann wrote:

quoted

xencons_disconnect_backend() is only called from xen_console_remove(),

and also from xencons_probe()/xencons_resume(). But those two are also under
the
same ifdef.

Good point. Aside from this the patch is good.

 

quoted

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));