From 95d43eb2e957470a3a96bcd94a2f1094bef12bde Mon Sep 17 00:00:00 2001 From: Tomasz Wroblewski Date: Wed, 28 Aug 2013 13:36:18 +0200 Subject: xen: update tx_ready callback for ARM serial drivers Type of tx_ready callback got changed to int to facilitate error condition, but the ARM serial drivers were not modified thus breaking the compilation. Reported-by: Julien Grall Signed-off-by: Tomasz Wroblewski --- 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(-) (limited to 'xen/drivers') diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index 9b34f92713..b297ed4a83 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 91391c86c8..ffa71db921 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 3ea0d41f8c..3ec6e109d7 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -155,7 +155,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; -- cgit v1.2.3