From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 21 May 2012 10:00:54 +0000 (+0200)
Subject: serial: serial_irq() and descendants can be __init
X-Git-Tag: 4.2.0-rc1~313
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=97d0de4e86ba4e4d966e6426c7ebaf2818a35368;p=xen.git

serial: serial_irq() and descendants can be __init

... as being solely called from smp_intr_init(), which itself is
marked such.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 67d0d0c43f..d77042e2d0 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -357,7 +357,7 @@ static void __init ns16550_endboot(struct serial_port *port)
 #define ns16550_endboot NULL
 #endif
 
-static int ns16550_irq(struct serial_port *port)
+static int __init ns16550_irq(struct serial_port *port)
 {
     struct ns16550 *uart = port->uart;
     return ((uart->irq > 0) ? uart->irq : -1);
diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index 8ddcac678d..41ffd659b6 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -215,7 +215,7 @@ static int pl011_getc(struct serial_port *port, char *pc)
     return 1;
 }
 
-static int pl011_irq(struct serial_port *port)
+static int __init pl011_irq(struct serial_port *port)
 {
     struct pl011 *uart = port->uart;
     return ((uart->irq > 0) ? uart->irq : -1);
diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c
index 8252823ef9..8591ae28fd 100644
--- a/xen/drivers/char/serial.c
+++ b/xen/drivers/char/serial.c
@@ -442,7 +442,7 @@ void __init serial_endboot(void)
             com[i].driver->endboot(&com[i]);
 }
 
-int serial_irq(int idx)
+int __init serial_irq(int idx)
 {
     if ( (idx >= 0) && (idx < ARRAY_SIZE(com)) &&
          com[idx].driver && com[idx].driver->irq )