[PATCH 03/03] staging: dgap: re-factor some more code for 80+ lines

[Mark Hounschell <markh@xxxxxxxxxx>]

This patch fixes more 80+ char lines as reported by checkpatch

Signed-off-by: Mark Hounschell <markh@xxxxxxxxxx>
Tested-by: Mark Hounschell <markh@xxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/staging/dgap/dgap.c | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 3ece1a4..df1cbf8 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -204,7 +204,7 @@ static void dgap_remove_tty_sysfs(struct device *c);
  */
 static int dgap_parsefile(char **in, int Remove);
 static struct cnode *dgap_find_config(int type, int bus, int slot);
-static uint dgap_config_get_number_of_ports(struct board_t *bd);
+static uint dgap_config_get_num_prts(struct board_t *bd);
 static char *dgap_create_config_string(struct board_t *bd, char *string);
 static uint dgap_config_get_useintr(struct board_t *bd);
 static uint dgap_config_get_altpin(struct board_t *bd);
@@ -1345,7 +1345,7 @@ static int dgap_tty_init(struct board_t *brd)
 	vaddr = brd->re_map_membase;
 	true_count = readw((vaddr + NCHAN));
 
-	brd->nasync = dgap_config_get_number_of_ports(brd);
+	brd->nasync = dgap_config_get_num_prts(brd);
 
 	if (!brd->nasync)
 		brd->nasync = brd->maxports;
@@ -6446,10 +6446,13 @@ static ssize_t dgap_tty_name_show(struct device *d,
 			} else
 				ptr1 = cptr->u.ttyname;
 
-			for (i = 0; i < dgap_config_get_number_of_ports(bd); i++) {
-				if (cn == i)
-					return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
-						(un->un_type == DGAP_PRINT) ? "pr" : "tty",
+			for (i = 0; i < dgap_config_get_num_prts(bd); i++) {
+				if (cn != i)
+					continue;
+
+				return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
+						(un->un_type == DGAP_PRINT) ?
+						 "pr" : "tty",
 						ptr1, i + starto);
 			}
 		}
@@ -6457,12 +6460,15 @@ static ssize_t dgap_tty_name_show(struct device *d,
 		if (cptr->type == CNODE) {
 
 			for (i = 0; i < cptr->u.conc.nport; i++) {
-				if (cn == (i + ncount))
+				if (cn != (i + ncount))
+					continue;
 
-					return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
-						(un->un_type == DGAP_PRINT) ? "pr" : "tty",
+				return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
+						(un->un_type == DGAP_PRINT) ?
+						 "pr" : "tty",
 						cptr->u.conc.id,
-						i + (cptr->u.conc.v_start ? cptr->u.conc.start : 1));
+						i + (cptr->u.conc.v_start ?
+						     cptr->u.conc.start : 1));
 			}
 
 			ncount += cptr->u.conc.nport;
@@ -6471,11 +6477,15 @@ static ssize_t dgap_tty_name_show(struct device *d,
 		if (cptr->type == MNODE) {
 
 			for (i = 0; i < cptr->u.module.nport; i++) {
-				if (cn == (i + ncount))
-					return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
-						(un->un_type == DGAP_PRINT) ? "pr" : "tty",
+				if (cn != (i + ncount))
+					continue;
+
+				return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
+						(un->un_type == DGAP_PRINT) ?
+						 "pr" : "tty",
 						cptr->u.module.id,
-						i + (cptr->u.module.v_start ? cptr->u.module.start : 1));
+						i + (cptr->u.module.v_start ?
+						     cptr->u.module.start : 1));
 			}
 
 			ncount += cptr->u.module.nport;
@@ -7598,7 +7608,7 @@ static struct cnode *dgap_find_config(int type, int bus, int slot)
  * all ports user specified should be on the board.
  * (This does NOT mean they are all actually present right now tho)
  */
-static uint dgap_config_get_number_of_ports(struct board_t *bd)
+static uint dgap_config_get_num_prts(struct board_t *bd)
 {
 	int count = 0;
 	struct cnode *p = NULL;
-- 
1.8.1.4

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel