mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-07 07:08:07 +00:00
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>
This commit is contained in:
parent
d54b181ea6
commit
d3641f64bc
1 changed files with 14 additions and 14 deletions
|
@ -1198,6 +1198,20 @@ console_initcall(xuartps_console_init);
|
||||||
|
|
||||||
#endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */
|
#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
|
#ifdef CONFIG_PM_SLEEP
|
||||||
/**
|
/**
|
||||||
* xuartps_suspend - suspend event
|
* 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);
|
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
|
* Platform bus binding
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue