Skip to contentSkip to conversation

tty: moxa: Fix coding style issues

PATCH In review Antoine Robertson 2 participants 2 messages Jan 22, 2019 – Jan 23, 2019 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 tty: moxa: Fix coding style issues

Fix coding style issues

---

[V3]: Added what changed from v1 and v2 below the ---
[V2]: Changed moxa_brdname[] to const and fixed brackets on an else statement

 drivers/tty/moxa.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/tty/moxa.c +10 -11
index 3a1a5e0ee93f..68d56a42a69b 100644
@@ -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,9 @@ 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 +1356,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 +1624,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.
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 1 line · Antoine Robertson

Fix coding style issues

That is really vague, you need to say exactly what type of coding style fixes you made here.

And if you made more than one "type" of fix, then you need to break the patch up into a series, only doing one "type" of fix per patch.

Yeah, that's a pain for when there are only tiny things that need to be changed, but that way it makes it easier for reviewers, and for fixing if it turns out any of your changes was not ok.

I recommend, if you want to do coding style fixes, to do so in the drivers/staging/ part of the kernel. That area has a lot more work to be done and you don't end up doing tiny things like this.

thanks,

greg k-h