Xen devel - Aug 2013 - [PATCH] Fix compilation on ARM

Type of tx_ready callback got changed to int to faciliate error condition, but
the ARM serial drivers were not modified thus breaking the compilation.

Reported-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
---
 xen/drivers/char/exynos4210-uart.c |    2 +-
 xen/drivers/char/omap-uart.c       |    2 +-
 xen/drivers/char/pl011.c           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/drivers/char/exynos4210-uart.c
b/xen/drivers/char/exynos4210-uart.c
index 9b34f92..b297ed4 100644
--- a/xen/drivers/char/exynos4210-uart.c
+++ b/xen/drivers/char/exynos4210-uart.c
@@ -221,7 +221,7 @@ static void exynos4210_uart_resume(struct serial_port *port)
     BUG(); // XXX
 }
 
-static unsigned int exynos4210_uart_tx_ready(struct serial_port *port)
+static int exynos4210_uart_tx_ready(struct serial_port *port)
 {
     struct exynos4210_uart *uart = port->uart;
 
diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c
index 91391c8..ffa71db 100644
--- a/xen/drivers/char/omap-uart.c
+++ b/xen/drivers/char/omap-uart.c
@@ -226,7 +226,7 @@ static void omap_uart_resume(struct serial_port *port)
     BUG();
 }
 
-static unsigned int omap_uart_tx_ready(struct serial_port *port)
+static int omap_uart_tx_ready(struct serial_port *port)
 {
     struct omap_uart *uart = port->uart;
     uint32_t reg;
diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index 0e1eb64..06e9e4e 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -153,7 +153,7 @@ static void pl011_resume(struct serial_port *port)
     BUG(); // XXX
 }
 
-static unsigned int pl011_tx_ready(struct serial_port *port)
+static int pl011_tx_ready(struct serial_port *port)
 {
     struct pl011 *uart = port->uart;
 
-- 
1.7.10.4

On Wed, 2013-08-28 at 13:36 +0200, Tomasz Wroblewski
wrote:
> Type of tx_ready callback got changed to int to faciliate error
                                                
facilitate
>  condition, but the ARM serial drivers were not modified thus breaking
> the compilation.
> 
> Reported-by: Julien Grall <julien.grall@linaro.org>
> Signed-off-by: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
Thanks for fixing this so promptly. I have committed with the above typo
fixed and the titled changed to the less generic "xen: update tx_ready
callback for ARM serial drivers"

Ian.