| From 34f391544b7f23c038293fff1b51a93e0cf3d598 Mon Sep 17 00:00:00 2001 |
| From: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| Date: Mon, 21 Oct 2013 16:41:00 -0700 |
| Subject: tty: xuartps: Fix build error due to missing forward declaration |
| |
| If CONFIG_PM_SLEEP is enabled and CONFIG_SERIAL_XILINX_PS_UART_CONSOLE |
| is not, a forward declaration of the uart_driver struct is not |
| included, leading to a build error due to an undeclared variable. |
| Fixing this by moving the definition of the struct uart_driver before |
| the definition of the suspend/resume callbacks. |
| |
| Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| Reported-by: kbuild test robot <fengguang.wu@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit d3641f64bc71765682754722fd42fae24366bb3a) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/tty/serial/xilinx_uartps.c | 28 ++++++++++++++-------------- |
| 1 file changed, 14 insertions(+), 14 deletions(-) |
| |
| diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c |
| index 5ac6c480df43..ca4a2f1fbca9 100644 |
| --- a/drivers/tty/serial/xilinx_uartps.c |
| +++ b/drivers/tty/serial/xilinx_uartps.c |
| @@ -1198,6 +1198,20 @@ console_initcall(xuartps_console_init); |
| |
| #endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */ |
| |
| +/** Structure Definitions |
| + */ |
| +static struct uart_driver xuartps_uart_driver = { |
| + .owner = THIS_MODULE, /* Owner */ |
| + .driver_name = XUARTPS_NAME, /* Driver name */ |
| + .dev_name = XUARTPS_TTY_NAME, /* Node name */ |
| + .major = XUARTPS_MAJOR, /* Major number */ |
| + .minor = XUARTPS_MINOR, /* Minor number */ |
| + .nr = XUARTPS_NR_PORTS, /* Number of UART ports */ |
| +#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE |
| + .cons = &xuartps_console, /* Console */ |
| +#endif |
| +}; |
| + |
| #ifdef CONFIG_PM_SLEEP |
| /** |
| * xuartps_suspend - suspend event |
| @@ -1311,20 +1325,6 @@ static int xuartps_resume(struct device *device) |
| |
| static SIMPLE_DEV_PM_OPS(xuartps_dev_pm_ops, xuartps_suspend, xuartps_resume); |
| |
| -/** Structure Definitions |
| - */ |
| -static struct uart_driver xuartps_uart_driver = { |
| - .owner = THIS_MODULE, /* Owner */ |
| - .driver_name = XUARTPS_NAME, /* Driver name */ |
| - .dev_name = XUARTPS_TTY_NAME, /* Node name */ |
| - .major = XUARTPS_MAJOR, /* Major number */ |
| - .minor = XUARTPS_MINOR, /* Minor number */ |
| - .nr = XUARTPS_NR_PORTS, /* Number of UART ports */ |
| -#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE |
| - .cons = &xuartps_console, /* Console */ |
| -#endif |
| -}; |
| - |
| /* --------------------------------------------------------------------- |
| * Platform bus binding |
| */ |
| -- |
| 1.8.5.rc3 |
| |
