serial: samsung: Minor whitespace cleanups
Make the code slightly more readable by removing unneeded line breaks, adding missing line breaks and white spaces. This also fixes few strict checkpatch suggestions: CHECK: spaces preferred around that '-' (ctx:VxV) CHECK: Unbalanced braces around else statement CHECK: Lines should not end with a '(' Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20200617152856.18086-1-krzk@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5de30b286e
commit
695b847b24
|
@ -327,7 +327,6 @@ static void s3c24xx_serial_tx_dma_complete(void *args)
|
|||
unsigned long flags;
|
||||
int count;
|
||||
|
||||
|
||||
dmaengine_tx_status(dma->tx_chan, dma->tx_cookie, &state);
|
||||
count = dma->tx_bytes_requested - state.residue;
|
||||
async_tx_ack(dma->tx_desc);
|
||||
|
@ -409,7 +408,6 @@ static int s3c24xx_serial_start_tx_dma(struct s3c24xx_uart_port *ourport,
|
|||
struct circ_buf *xmit = &port->state->xmit;
|
||||
struct s3c24xx_uart_dma *dma = ourport->dma;
|
||||
|
||||
|
||||
if (ourport->tx_mode != S3C24XX_TX_DMA)
|
||||
enable_tx_dma(ourport);
|
||||
|
||||
|
@ -816,7 +814,6 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
static irqreturn_t s3c24xx_serial_rx_chars(int irq, void *dev_id)
|
||||
{
|
||||
struct s3c24xx_uart_port *ourport = dev_id;
|
||||
|
@ -842,8 +839,8 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
|
|||
count >= ourport->min_dma_size) {
|
||||
int align = dma_get_cache_alignment() -
|
||||
(xmit->tail & (dma_get_cache_alignment() - 1));
|
||||
if (count-align >= ourport->min_dma_size) {
|
||||
dma_count = count-align;
|
||||
if (count - align >= ourport->min_dma_size) {
|
||||
dma_count = count - align;
|
||||
count = align;
|
||||
}
|
||||
}
|
||||
|
@ -1589,7 +1586,6 @@ s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
|
||||
|
||||
static struct console s3c24xx_serial_console;
|
||||
|
@ -1672,7 +1668,6 @@ s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS] = {
|
|||
}
|
||||
},
|
||||
#if CONFIG_SERIAL_SAMSUNG_UARTS > 2
|
||||
|
||||
[2] = {
|
||||
.port = {
|
||||
.lock = __PORT_LOCK_UNLOCKED(2),
|
||||
|
@ -1728,7 +1723,6 @@ static void s3c24xx_serial_resetport(struct uart_port *port,
|
|||
udelay(1);
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_ARM_S3C24XX_CPUFREQ
|
||||
|
||||
static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
|
||||
|
@ -1903,9 +1897,9 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
|
|||
|
||||
port->mapbase = res->start;
|
||||
ret = platform_get_irq(platdev, 0);
|
||||
if (ret < 0)
|
||||
if (ret < 0) {
|
||||
port->irq = 0;
|
||||
else {
|
||||
} else {
|
||||
port->irq = ret;
|
||||
ourport->rx_irq = ret;
|
||||
ourport->tx_irq = ret + 1;
|
||||
|
@ -1977,8 +1971,8 @@ static const struct of_device_id s3c24xx_uart_dt_match[];
|
|||
|
||||
static int probe_index;
|
||||
|
||||
static inline struct s3c24xx_serial_drv_data *s3c24xx_get_driver_data(
|
||||
struct platform_device *pdev)
|
||||
static inline struct s3c24xx_serial_drv_data *
|
||||
s3c24xx_get_driver_data(struct platform_device *pdev)
|
||||
{
|
||||
#ifdef CONFIG_OF
|
||||
if (pdev->dev.of_node) {
|
||||
|
@ -2329,7 +2323,6 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
|
|||
*baud = rate / (16 * (ubrdiv + 1));
|
||||
dev_dbg(port->dev, "calculated baud %d\n", *baud);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static int __init
|
||||
|
@ -2696,6 +2689,7 @@ static int __init s3c2410_early_console_setup(struct earlycon_device *device,
|
|||
device->port.private_data = &s3c2410_early_console_data;
|
||||
return samsung_early_console_setup(device, opt);
|
||||
}
|
||||
|
||||
OF_EARLYCON_DECLARE(s3c2410, "samsung,s3c2410-uart",
|
||||
s3c2410_early_console_setup);
|
||||
|
||||
|
@ -2710,6 +2704,7 @@ static int __init s3c2440_early_console_setup(struct earlycon_device *device,
|
|||
device->port.private_data = &s3c2440_early_console_data;
|
||||
return samsung_early_console_setup(device, opt);
|
||||
}
|
||||
|
||||
OF_EARLYCON_DECLARE(s3c2412, "samsung,s3c2412-uart",
|
||||
s3c2440_early_console_setup);
|
||||
OF_EARLYCON_DECLARE(s3c2440, "samsung,s3c2440-uart",
|
||||
|
@ -2728,6 +2723,7 @@ static int __init s5pv210_early_console_setup(struct earlycon_device *device,
|
|||
device->port.private_data = &s5pv210_early_console_data;
|
||||
return samsung_early_console_setup(device, opt);
|
||||
}
|
||||
|
||||
OF_EARLYCON_DECLARE(s5pv210, "samsung,s5pv210-uart",
|
||||
s5pv210_early_console_setup);
|
||||
OF_EARLYCON_DECLARE(exynos4210, "samsung,exynos4210-uart",
|
||||
|
|
Loading…
Reference in New Issue