This patch touches tools/xl and xen/. clang-format, if applied, will only change xen/ part.
Signed-off-by: Oleksandr Andrushchenko <andr2...@gmail.com> --- tools/xl/xl_info.c | 6 ++---- xen/drivers/char/ns16550.c | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 72e87eac46d1..cbb0f695685f 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -59,8 +59,7 @@ static int maybe_printf(const char *fmt, ...) return count; } -static yajl_gen_status printf_info_one_json(yajl_gen hand, int domid, - libxl_domain_config *d_config) +static yajl_gen_status printf_info_one_json(yajl_gen hand, int domid, libxl_domain_config *d_config) { yajl_gen_status s; @@ -68,8 +67,7 @@ static yajl_gen_status printf_info_one_json(yajl_gen hand, int domid, if (s != yajl_gen_status_ok) goto out; - s = yajl_gen_string(hand, (const unsigned char *)"domid", - sizeof("domid")-1); + s = yajl_gen_string(hand, (const unsigned char *)"domid", sizeof("domid")-1); if (s != yajl_gen_status_ok) goto out; if (domid != -1) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index eaeb0e09d01e..53586f110008 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -340,9 +340,7 @@ static void ns16550_setup_preirq(struct ns16550 *uart) if ( divisor ) uart->baud = uart->clock_hz / (divisor << 4); else - printk(XENLOG_ERR - "Automatic baud rate determination was requested," - " but a baud rate was not set up\n"); + printk(XENLOG_ERR "Automatic baud rate determination was requested," " but a baud rate was not set up\n"); } ns_write_reg(uart, UART_LCR, lcr); @@ -350,8 +348,8 @@ static void ns16550_setup_preirq(struct ns16550 *uart) ns_write_reg(uart, UART_MCR, UART_MCR_DTR | UART_MCR_RTS); /* Enable and clear the FIFOs. Set a large trigger threshold. */ - ns_write_reg(uart, UART_FCR, - UART_FCR_ENABLE | UART_FCR_CLRX | UART_FCR_CLTX | UART_FCR_TRG14); + ns_write_reg(uart, UART_FCR, UART_FCR_ENABLE | UART_FCR_CLRX | + UART_FCR_CLTX | UART_FCR_TRG14); } static void __init cf_check ns16550_init_preirq(struct serial_port *port) @@ -398,8 +396,8 @@ static void ns16550_setup_postirq(struct ns16550 *uart) if ( uart->irq > 0 ) { /* Master interrupt enable; also keep DTR/RTS asserted. */ - ns_write_reg(uart, - UART_MCR, UART_MCR_OUT2 | UART_MCR_DTR | UART_MCR_RTS); + ns_write_reg(uart, UART_MCR, + UART_MCR_OUT2 | UART_MCR_DTR | UART_MCR_RTS); /* Enable receive interrupts. */ ns_write_reg(uart, UART_IER, UART_IER_ERDAI); -- 2.25.1