Commit 740dc2de authored by Anton Wuerfel's avatar Anton Wuerfel Committed by Greg Kroah-Hartman

tty: serial: 8250: Fix multiline comment style

Checkpatch outputs some warnings about incorrect comment style,
which is fixed by this patch.
Signed-off-by: default avatarAnton Würfel <anton.wuerfel@fau.de>
Signed-off-by: default avatarPhillip Raffeck <phillip.raffeck@fau.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@i4.cs.fau.de
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7941f50
...@@ -156,14 +156,18 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value) ...@@ -156,14 +156,18 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)
break; break;
case UART_IER: case UART_IER:
/* Enable receive timeout interrupt with the /*
* receive line status interrupt */ * Enable receive timeout interrupt with the receive line
* status interrupt.
*/
value |= (value & 0x4) << 2; value |= (value & 0x4) << 2;
break; break;
case UART_MCR: case UART_MCR:
/* If we have enabled modem status IRQs we should enable modem /*
* mode. */ * If we have enabled modem status IRQs we should enable
* modem mode.
*/
ier = p->serial_in(p, UART_IER); ier = p->serial_in(p, UART_IER);
if (ier & UART_IER_MSI) if (ier & UART_IER_MSI)
......
...@@ -357,8 +357,8 @@ static const struct pnp_device_id pnp_dev_table[] = { ...@@ -357,8 +357,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
/* Fujitsu Wacom 1FGT Tablet PC device */ /* Fujitsu Wacom 1FGT Tablet PC device */
{ "FUJ02E9", 0 }, { "FUJ02E9", 0 },
/* /*
* LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6
* disguise) * in disguise).
*/ */
{ "LTS0001", 0 }, { "LTS0001", 0 },
/* Rockwell's (PORALiNK) 33600 INT PNP */ /* Rockwell's (PORALiNK) 33600 INT PNP */
...@@ -367,12 +367,14 @@ static const struct pnp_device_id pnp_dev_table[] = { ...@@ -367,12 +367,14 @@ static const struct pnp_device_id pnp_dev_table[] = {
{ "PNPCXXX", UNKNOWN_DEV }, { "PNPCXXX", UNKNOWN_DEV },
/* More unknown PnP modems */ /* More unknown PnP modems */
{ "PNPDXXX", UNKNOWN_DEV }, { "PNPDXXX", UNKNOWN_DEV },
/* Winbond CIR port, should not be probed. We should keep track /*
of it to prevent the legacy serial driver from probing it */ * Winbond CIR port, should not be probed. We should keep track of
* it to prevent the legacy serial driver from probing it.
*/
{ "WEC1022", CIR_PORT }, { "WEC1022", CIR_PORT },
/* /*
* SMSC IrCC SIR/FIR port, should not be probed by serial driver * SMSC IrCC SIR/FIR port, should not be probed by serial driver as
* as well so its own driver can bind to it. * well so its own driver can bind to it.
*/ */
{ "SMCF010", CIR_PORT }, { "SMCF010", CIR_PORT },
{ "", 0 } { "", 0 }
......
...@@ -251,9 +251,11 @@ static const struct serial8250_config uart_config[] = { ...@@ -251,9 +251,11 @@ static const struct serial8250_config uart_config[] = {
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO | UART_CAP_AFE, .flags = UART_CAP_FIFO | UART_CAP_AFE,
}, },
/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement /*
workaround of errata A-008006 which states that tx_loadsz should be * tx_loadsz is set to 63-bytes instead of 64-bytes to implement
configured less than Maximum supported fifo bytes */ * workaround of errata A-008006 which states that tx_loadsz should
* be configured less than Maximum supported fifo bytes.
*/
[PORT_16550A_FSL64] = { [PORT_16550A_FSL64] = {
.name = "16550A_FSL64", .name = "16550A_FSL64",
.fifo_size = 64, .fifo_size = 64,
...@@ -2198,23 +2200,23 @@ int serial8250_do_startup(struct uart_port *port) ...@@ -2198,23 +2200,23 @@ int serial8250_do_startup(struct uart_port *port)
serial8250_set_mctrl(port, port->mctrl); serial8250_set_mctrl(port, port->mctrl);
/* Serial over Lan (SoL) hack: /*
Intel 8257x Gigabit ethernet chips have a * Serial over Lan (SoL) hack:
16550 emulation, to be used for Serial Over Lan. * Intel 8257x Gigabit ethernet chips have a 16550 emulation, to be
Those chips take a longer time than a normal * used for Serial Over Lan. Those chips take a longer time than a
serial device to signalize that a transmission * normal serial device to signalize that a transmission data was
data was queued. Due to that, the above test generally * queued. Due to that, the above test generally fails. One solution
fails. One solution would be to delay the reading of * would be to delay the reading of iir. However, this is not
iir. However, this is not reliable, since the timeout * reliable, since the timeout is variable. So, let's just don't
is variable. So, let's just don't test if we receive * test if we receive TX irq. This way, we'll never enable
TX irq. This way, we'll never enable UART_BUG_TXEN. * UART_BUG_TXEN.
*/ */
if (up->port.flags & UPF_NO_TXEN_TEST) if (up->port.flags & UPF_NO_TXEN_TEST)
goto dont_test_tx_en; goto dont_test_tx_en;
/* /*
* Do a quick test to see if we receive an * Do a quick test to see if we receive an interrupt when we enable
* interrupt when we enable the TX irq. * the TX irq.
*/ */
serial_port_out(port, UART_IER, UART_IER_THRI); serial_port_out(port, UART_IER, UART_IER_THRI);
lsr = serial_port_in(port, UART_LSR); lsr = serial_port_in(port, UART_LSR);
......
...@@ -441,16 +441,20 @@ static int simple_config(struct pcmcia_device *link) ...@@ -441,16 +441,20 @@ static int simple_config(struct pcmcia_device *link)
struct serial_info *info = link->priv; struct serial_info *info = link->priv;
int i = -ENODEV, try; int i = -ENODEV, try;
/* First pass: look for a config entry that looks normal. /*
* Two tries: without IO aliases, then with aliases */ * First pass: look for a config entry that looks normal.
* Two tries: without IO aliases, then with aliases.
*/
link->config_flags |= CONF_AUTO_SET_VPP; link->config_flags |= CONF_AUTO_SET_VPP;
for (try = 0; try < 4; try++) for (try = 0; try < 4; try++)
if (!pcmcia_loop_config(link, simple_config_check, &try)) if (!pcmcia_loop_config(link, simple_config_check, &try))
goto found_port; goto found_port;
/* Second pass: try to find an entry that isn't picky about /*
its base address, then try to grab any standard serial port * Second pass: try to find an entry that isn't picky about
address, and finally try to get any free port. */ * its base address, then try to grab any standard serial port
* address, and finally try to get any free port.
*/
if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL)) if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))
goto found_port; goto found_port;
...@@ -480,8 +484,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data) ...@@ -480,8 +484,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)
if (p_dev->resource[1]->end) if (p_dev->resource[1]->end)
return -EINVAL; return -EINVAL;
/* The quad port cards have bad CIS's, so just look for a /*
window larger than 8 ports and assume it will be right */ * The quad port cards have bad CIS's, so just look for a
* window larger than 8 ports and assume it will be right.
*/
if (p_dev->resource[0]->end <= 8) if (p_dev->resource[0]->end <= 8)
return -EINVAL; return -EINVAL;
...@@ -623,8 +629,10 @@ static int serial_config(struct pcmcia_device *link) ...@@ -623,8 +629,10 @@ static int serial_config(struct pcmcia_device *link)
break; break;
} }
/* Another check for dual-serial cards: look for either serial or /*
multifunction cards that ask for appropriate IO port ranges */ * Another check for dual-serial cards: look for either serial or
* multifunction cards that ask for appropriate IO port ranges.
*/
if ((info->multi == 0) && if ((info->multi == 0) &&
(link->has_func_id) && (link->has_func_id) &&
(link->socket->pcmcia_pfc == 0) && (link->socket->pcmcia_pfc == 0) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment