From: Antoine Robertson <antoinerbrtsn@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
Antoine Robertson <antoinerbrtsn@gmail.com>
Subject: [PATCH v2] tty: moxa: Fix coding style issues
Date: Sat, 19 Jan 2019 17:52:05 -0500 [thread overview]
Message-ID: <20190119225205.11179-1-antoinerbrtsn@gmail.com> (raw)
Fix coding style issues
Signed-off-by: Antoine Robertson <antoinerbrtsn@gmail.com>
---
drivers/tty/moxa.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 3a1a5e0ee93f..9b6dcb4f7905 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 const char * const 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,9 +1355,9 @@ 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);
+ }
}
static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
@@ -1625,10 +1623,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
next reply other threads:[~2019-01-19 22:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 22:52 Antoine Robertson [this message]
2019-01-21 22:45 [PATCH v2] tty: moxa: Fix coding style issues Antoine Robertson
2019-01-22 7:15 ` Greg KH
2019-01-22 11:16 ` Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190119225205.11179-1-antoinerbrtsn@gmail.com \
--to=antoinerbrtsn@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).