Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1293060 > unrolled thread
| Started by | Anton Wuerfel <anton.wuerfel@fau.de> |
|---|---|
| First post | 2015-12-16 16:50 +0100 |
| Last post | 2015-12-16 18:00 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 04/11] tty: serial: 8250: Fix multiline comment style Anton Wuerfel <anton.wuerfel@fau.de> - 2015-12-16 16:50 +0100
Re: [PATCH 04/11] tty: serial: 8250: Fix multiline comment style Peter Hurley <peter@hurleysoftware.com> - 2015-12-16 18:00 +0100
| From | Anton Wuerfel <anton.wuerfel@fau.de> |
|---|---|
| Date | 2015-12-16 16:50 +0100 |
| Subject | [PATCH 04/11] tty: serial: 8250: Fix multiline comment style |
| Message-ID | <qGmv0-3Cs-41@gated-at.bofh.it> |
Checkpatch outputs some warnings about incorrect comment style,
which is fixed by this patch.
Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
CC: linux-kernel@i4.cs.fau.de
---
drivers/tty/serial/8250/8250_ingenic.c | 6 ++-
drivers/tty/serial/8250/8250_pnp.c | 6 ++-
drivers/tty/serial/8250/8250_port.c | 29 ++++++-----
drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++---------------
4 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index 49394b4..c53d2501 100644
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)
case UART_IER:
/* Enable receive timeout interrupt with the
- * receive line status interrupt */
+ * receive line status interrupt
+ */
value |= (value & 0x4) << 2;
break;
case UART_MCR:
/* If we have enabled modem status IRQs we should enable modem
- * mode. */
+ * mode.
+ */
ier = p->serial_in(p, UART_IER);
if (ier & UART_IER_MSI)
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 1f18065..2731031 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = {
{ "PNPCXXX", UNKNOWN_DEV },
/* More unknown PnP modems */
{ "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 },
/*
* SMSC IrCC SIR/FIR port, should not be probed by serial driver
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 57ad0f2..0ec823e 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = {
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.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
-configured less than Maximum supported fifo bytes */
+ /*
+ * 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
+ * configured less than Maximum supported fifo bytes
+ */
[PORT_16550A_FSL64] = {
.name = "16550A_FSL64",
.fifo_size = 64,
@@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port)
serial8250_set_mctrl(port, port->mctrl);
- /* Serial over Lan (SoL) hack:
- Intel 8257x Gigabit ethernet chips have a
- 16550 emulation, to be used for Serial Over Lan.
- Those chips take a longer time than a normal
- serial device to signalize that a transmission
- data was queued. Due to that, the above test generally
- fails. One solution would be to delay the reading of
- iir. However, this is not reliable, since the timeout
- is variable. So, let's just don't test if we receive
- TX irq. This way, we'll never enable UART_BUG_TXEN.
+ /*
+ * Serial over Lan (SoL) hack:
+ * Intel 8257x Gigabit ethernet chips have a
+ * 16550 emulation, to be used for Serial Over Lan.
+ * Those chips take a longer time than a normal
+ * serial device to signalize that a transmission
+ * data was queued. Due to that, the above test generally
+ * fails. One solution would be to delay the reading of
+ * iir. However, this is not reliable, since the timeout
+ * is variable. So, let's just don't test if we receive
+ * TX irq. This way, we'll never enable UART_BUG_TXEN.
*/
if (up->port.flags & UPF_NO_TXEN_TEST)
goto dont_test_tx_en;
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index f5270ba..a4bdcf6 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -1,35 +1,37 @@
-/*======================================================================
-
- A driver for PCMCIA serial devices
-
- serial_cs.c 1.134 2002/05/04 05:48:53
-
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
- The initial developer of the original code is David A. Hinds
- <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
- are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
-
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
-======================================================================*/
+/*
+ * ======================================================================
+ *
+ * A driver for PCMCIA serial devices
+ *
+ * serial_cs.c 1.134 2002/05/04 05:48:53
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License version 2 (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of the
+ * above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete
+ * the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ======================================================================
+ */
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link)
struct serial_info *info = link->priv;
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;
for (try = 0; try < 4; try++)
if (!pcmcia_loop_config(link, simple_config_check, &try))
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
- address, and finally try to get any free port. */
+ /*
+ * Second pass: try to find an entry that isn't picky about
+ * 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))
goto found_port;
@@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)
if (p_dev->resource[1]->end)
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)
return -EINVAL;
@@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link)
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) &&
(link->has_func_id) &&
(link->socket->pcmcia_pfc == 0) &&
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Peter Hurley <peter@hurleysoftware.com> |
|---|---|
| Date | 2015-12-16 18:00 +0100 |
| Message-ID | <qGnAK-4iQ-19@gated-at.bofh.it> |
| In reply to | #1293060 |
On 12/16/2015 07:36 AM, Anton Wuerfel wrote:
> Checkpatch outputs some warnings about incorrect comment style,
> which is fixed by this patch.
>
Please fix the comments in a consistent fashion. For example ...
> Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
> Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
> CC: linux-kernel@i4.cs.fau.de
> ---
> drivers/tty/serial/8250/8250_ingenic.c | 6 ++-
> drivers/tty/serial/8250/8250_pnp.c | 6 ++-
> drivers/tty/serial/8250/8250_port.c | 29 ++++++-----
> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++---------------
> 4 files changed, 75 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
> index 49394b4..c53d2501 100644
> --- a/drivers/tty/serial/8250/8250_ingenic.c
> +++ b/drivers/tty/serial/8250/8250_ingenic.c
> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)
>
> case UART_IER:
> /* Enable receive timeout interrupt with the
> - * receive line status interrupt */
> + * receive line status interrupt
> + */
This isn't the same style as ...
> value |= (value & 0x4) << 2;
> break;
>
> case UART_MCR:
> /* If we have enabled modem status IRQs we should enable modem
> - * mode. */
> + * mode.
> + */
> ier = p->serial_in(p, UART_IER);
>
> if (ier & UART_IER_MSI)
> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
> index 1f18065..2731031 100644
> --- a/drivers/tty/serial/8250/8250_pnp.c
> +++ b/drivers/tty/serial/8250/8250_pnp.c
> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = {
> { "PNPCXXX", UNKNOWN_DEV },
> /* More unknown PnP modems */
> { "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
> + */
this style.
> { "WEC1022", CIR_PORT },
> /*
> * SMSC IrCC SIR/FIR port, should not be probed by serial driver
> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
> index 57ad0f2..0ec823e 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = {
> .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
> .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
> -configured less than Maximum supported fifo bytes */
> + /*
> + * 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
> + * configured less than Maximum supported fifo bytes
> + */
> [PORT_16550A_FSL64] = {
> .name = "16550A_FSL64",
> .fifo_size = 64,
> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port)
>
> serial8250_set_mctrl(port, port->mctrl);
>
> - /* Serial over Lan (SoL) hack:
> - Intel 8257x Gigabit ethernet chips have a
> - 16550 emulation, to be used for Serial Over Lan.
> - Those chips take a longer time than a normal
> - serial device to signalize that a transmission
> - data was queued. Due to that, the above test generally
> - fails. One solution would be to delay the reading of
> - iir. However, this is not reliable, since the timeout
> - is variable. So, let's just don't test if we receive
> - TX irq. This way, we'll never enable UART_BUG_TXEN.
> + /*
> + * Serial over Lan (SoL) hack:
> + * Intel 8257x Gigabit ethernet chips have a
> + * 16550 emulation, to be used for Serial Over Lan.
> + * Those chips take a longer time than a normal
> + * serial device to signalize that a transmission
> + * data was queued. Due to that, the above test generally
> + * fails. One solution would be to delay the reading of
> + * iir. However, this is not reliable, since the timeout
> + * is variable. So, let's just don't test if we receive
> + * TX irq. This way, we'll never enable UART_BUG_TXEN.
> */
Might as well unwrap this to max line length too.
> if (up->port.flags & UPF_NO_TXEN_TEST)
> goto dont_test_tx_en;
> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
> index f5270ba..a4bdcf6 100644
> --- a/drivers/tty/serial/8250/serial_cs.c
> +++ b/drivers/tty/serial/8250/serial_cs.c
> @@ -1,35 +1,37 @@
> -/*======================================================================
> -
> - A driver for PCMCIA serial devices
> -
> - serial_cs.c 1.134 2002/05/04 05:48:53
> -
> - The contents of this file are subject to the Mozilla Public
> - License Version 1.1 (the "License"); you may not use this file
> - except in compliance with the License. You may obtain a copy of
> - the License at http://www.mozilla.org/MPL/
> -
> - Software distributed under the License is distributed on an "AS
> - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
> - implied. See the License for the specific language governing
> - rights and limitations under the License.
> -
> - The initial developer of the original code is David A. Hinds
> - <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
> - are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
> -
> - Alternatively, the contents of this file may be used under the
> - terms of the GNU General Public License version 2 (the "GPL"), in which
> - case the provisions of the GPL are applicable instead of the
> - above. If you wish to allow the use of your version of this file
> - only under the terms of the GPL and not to allow others to use
> - your version of this file under the MPL, indicate your decision
> - by deleting the provisions above and replace them with the notice
> - and other provisions required by the GPL. If you do not delete
> - the provisions above, a recipient may use your version of this
> - file under either the MPL or the GPL.
> -
> -======================================================================*/
> +/*
> + * ======================================================================
> + *
> + * A driver for PCMCIA serial devices
> + *
> + * serial_cs.c 1.134 2002/05/04 05:48:53
> + *
> + * The contents of this file are subject to the Mozilla Public
> + * License Version 1.1 (the "License"); you may not use this file
> + * except in compliance with the License. You may obtain a copy of
> + * the License at http://www.mozilla.org/MPL/
> + *
> + * Software distributed under the License is distributed on an "AS
> + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
> + * implied. See the License for the specific language governing
> + * rights and limitations under the License.
> + *
> + * The initial developer of the original code is David A. Hinds
> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
> + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
> + *
> + * Alternatively, the contents of this file may be used under the
> + * terms of the GNU General Public License version 2 (the "GPL"), in which
> + * case the provisions of the GPL are applicable instead of the
> + * above. If you wish to allow the use of your version of this file
> + * only under the terms of the GPL and not to allow others to use
> + * your version of this file under the MPL, indicate your decision
> + * by deleting the provisions above and replace them with the notice
> + * and other provisions required by the GPL. If you do not delete
> + * the provisions above, a recipient may use your version of this
> + * file under either the MPL or the GPL.
> + *
> + * ======================================================================
> + */
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link)
> struct serial_info *info = link->priv;
> 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;
> for (try = 0; try < 4; try++)
> if (!pcmcia_loop_config(link, simple_config_check, &try))
> 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
> - address, and finally try to get any free port. */
> + /*
> + * Second pass: try to find an entry that isn't picky about
> + * 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))
> goto found_port;
>
> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)
> if (p_dev->resource[1]->end)
> 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)
> return -EINVAL;
>
> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link)
> 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) &&
> (link->has_func_id) &&
> (link->socket->pcmcia_pfc == 0) &&
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web