* [PATCH] tty: moxa: Fix coding style issues
@ 2019-01-19 22:05 Antoine Robertson
2019-01-19 22:11 ` Joe Perches
0 siblings, 1 reply; 2+ messages in thread
From: Antoine Robertson @ 2019-01-19 22:05 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, Antoine Robertson
Fix coding style issues
Signed-off-by: Antoine Robertson <antoinerbrtsn@gmail.com>
---
drivers/tty/moxa.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 3a1a5e0ee93f..8641f8ecf1d6 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -42,7 +42,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <linux/uaccess.h>
#include "moxa.h"
@@ -74,8 +74,7 @@ enum {
MOXA_BOARD_CP204J,
};
-static char *moxa_brdname[] =
-{
+static char *moxa_brdname[] = {
"C218 Turbo PCI series",
"C218 Turbo ISA series",
"C320 Turbo PCI series",
@@ -1159,9 +1158,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
int port;
port = tty->index;
- if (port == MAX_PORTS) {
+ if (port == MAX_PORTS)
return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
- }
if (mutex_lock_interruptible(&moxa_openlock))
return -ERESTARTSYS;
brd = &moxa_boards[port / MAX_PORTS_PER_BOARD];
@@ -1357,8 +1355,7 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
spin_unlock_irqrestore(&p->port.lock, flags);
if (!dcd)
tty_port_tty_hangup(&p->port, true);
- }
- else
+ } else
spin_unlock_irqrestore(&p->port.lock, flags);
}
@@ -1625,10 +1622,10 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)
* Syntax:
* void MoxaPortFlushData(int port, int mode);
* int port : port number (0 - 127)
- * int mode
- * 0 : flush the Rx buffer
- * 1 : flush the Tx buffer
- * 2 : flush the Rx and Tx buffer
+ * int mode
+ * 0 : flush the Rx buffer
+ * 1 : flush the Tx buffer
+ * 2 : flush the Rx and Tx buffer
*
*
* Function 20: Write data.
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] tty: moxa: Fix coding style issues
2019-01-19 22:05 [PATCH] tty: moxa: Fix coding style issues Antoine Robertson
@ 2019-01-19 22:11 ` Joe Perches
0 siblings, 0 replies; 2+ messages in thread
From: Joe Perches @ 2019-01-19 22:11 UTC (permalink / raw)
To: Antoine Robertson, gregkh; +Cc: linux-kernel
On Sat, 2019-01-19 at 17:05 -0500, Antoine Robertson wrote:
> Fix coding style issues
[]
> diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
[]
> @@ -74,8 +74,7 @@ enum {
> MOXA_BOARD_CP204J,
> };
>
> -static char *moxa_brdname[] =
> -{
> +static char *moxa_brdname[] = {
If you're going to fix this, might as well make it static const char *
> "C218 Turbo PCI series",
> "C218 Turbo ISA series",
> "C320 Turbo PCI series",
[]
> @@ -1357,8 +1355,7 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
> spin_unlock_irqrestore(&p->port.lock, flags);
> if (!dcd)
> tty_port_tty_hangup(&p->port, true);
> - }
> - else
> + } else
and use } else {
> spin_unlock_irqrestore(&p->port.lock, flags);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-19 22:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-19 22:05 [PATCH] tty: moxa: Fix coding style issues Antoine Robertson
2019-01-19 22:11 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®