All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/10] parser header and c file patches
@ 2014-12-01 12:26 Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 01/10] staging: unisys: parser_init camel cases Jeffrey Brown
                   ` (14 more replies)
  0 siblings, 15 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

This series of patches made corrections to the camel casing and typedef
problems in parser header and parser.c. There is a camel case in parser header
where visorchipset_main.c was affected as well. Smaller problems like space
after casts, braces, and logical coninuations in parser.c were solved as well.

Jeffrey Brown (10):
  staging: unisys: parser_init camel cases
  staging: unisys: parser_init_byteStream camel case
  staging: unisys: simpleString_get & byteStream_get camel case
  staging: unisys: PARSER_CONTEXT typedef
  staging: unisys: PARSER_WHICH_STRING typedef
  staging: unisys: Controlvm_Payload_Bytes_Buffered camel case
  staging: unisys: parser_init_guts and parser_param_start camel case
  staging: unisys: parser.c space after casts
  staging: unisys: parser.c braces
  staging: unisys: parser.c logical continuation

 drivers/staging/unisys/visorchipset/parser.c       | 117 +++++++++++----------
 drivers/staging/unisys/visorchipset/parser.h       |  29 ++---
 .../unisys/visorchipset/visorchipset_main.c        |  12 ++-
 3 files changed, 81 insertions(+), 77 deletions(-)

-- 
1.9.1

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 01/10] staging: unisys: parser_init camel cases
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 1/4] staging: unisys: visorchipset proc code Jeffrey Brown
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed camel cases for parser_init
isLocal => is_local
tryAgain => try_again

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 drivers/staging/unisys/visorchipset/parser.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 9edbd3b..38264c6 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -155,9 +155,9 @@ Away:
 }
 
 PARSER_CONTEXT *
-parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
+parser_init(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 {
-	return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain);
+	return parser_init_guts(addr, bytes, is_local, TRUE, try_again);
 }
 
 /* Call this instead of parser_init() if the payload area consists of just
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index 9fbe3b5..4f26413 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -33,7 +33,8 @@ typedef enum {
 
 typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
 
-PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain);
+PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL is_local,
+			    BOOL *try_again);
 PARSER_CONTEXT *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
 				       BOOL *tryAgain);
 void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 1/4] staging: unisys: visorchipset proc code
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 01/10] staging: unisys: parser_init camel cases Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 02/10] staging: unisys: parser_init_byteStream camel case Jeffrey Brown
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Removed proc code from visorchipset header and main. I also assume
that code involving "process" is not the same as code involving
"proc"

Replaced two struct proc_dir_entrys and replaced them with voids
struct proc_dir_entry *proc_dir => void reserved
struct proc_dir_entry *proc_info => void reserved2

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/include/uisqueue.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h
index 25b6181..6ddc0bf 100644
--- a/drivers/staging/unisys/include/uisqueue.h
+++ b/drivers/staging/unisys/include/uisqueue.h
@@ -160,8 +160,8 @@ struct bus_info {
 	uuid_le bus_inst_uuid;
 	struct ultra_vbus_channel_protocol __iomem *bus_channel;
 	int bus_channel_bytes;
-	struct proc_dir_entry *proc_dir;	/* proc/uislib/vbus/<x> */
-	struct proc_dir_entry *proc_info;	/* proc/uislib/vbus/<x>/info */
+	void *reserved;	/* proc/uislib/vbus/<x> */
+	void *reserved2;	/* proc/uislib/vbus/<x>/info */
 	char name[25];
 	char partition_name[99];
 	struct bus_info *next;
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 02/10] staging: unisys: parser_init_byteStream camel case
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 01/10] staging: unisys: parser_init camel cases Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 1/4] staging: unisys: visorchipset proc code Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 2/4] staging: unisys: uisutils.h and uisutils.c proc code Jeffrey Brown
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Changed the camel cases for the struct parser_init_bytestream
parser_init_byteStream => parser_init_bytestream
isLocal => is_local
tryAgain => try_again

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c            | 4 ++--
 drivers/staging/unisys/visorchipset/parser.h            | 4 ++--
 drivers/staging/unisys/visorchipset/visorchipset_main.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 38264c6..8cd3b4f 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -166,9 +166,9 @@ parser_init(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
  * parser_byteStream_get() to obtain the data.
  */
 PARSER_CONTEXT *
-parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
+parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 {
-	return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain);
+	return parser_init_guts(addr, bytes, is_local, FALSE, try_again);
 }
 
 /* Obtain '\0'-terminated copy of string in payload area.
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index 4f26413..10b922e 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -35,8 +35,8 @@ typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
 
 PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL is_local,
 			    BOOL *try_again);
-PARSER_CONTEXT *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
-				       BOOL *tryAgain);
+PARSER_CONTEXT  *parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local,
+				       BOOL *try_again);
 void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
 void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize);
 void *parser_string_get(PARSER_CONTEXT *ctx);
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index c8f7bea..5010c65 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1811,7 +1811,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 		BOOL retry = FALSE;
 
 		parser_ctx =
-		    parser_init_byteStream(parametersAddr, parametersBytes,
+		    parser_init_bytestream(parametersAddr, parametersBytes,
 					   isLocalAddr, &retry);
 		if (!parser_ctx) {
 			if (retry) {
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 2/4] staging: unisys: uisutils.h and uisutils.c proc code
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (2 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 02/10] staging: unisys: parser_init_byteStream camel case Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 03/10] staging: unisys: simpleString_get & byteStream_get camel case Jeffrey Brown
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Left the functions "uisutil_add_proc_line_ex" in both files alone
because they were declared in the files and not pulled from the
proc header file. However the PROC_READ_BUFFER_SIZE was changed
to READ_BUFFER_SIZE in the files.
PROC_READ_BUFFER_SIZE => READ_BUFFER_SIZE

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/include/uisutils.h | 4 ++--
 drivers/staging/unisys/uislib/uislib.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 7414220..a202d76 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -108,8 +108,8 @@ dbg_iounmap(void __iomem *addr, char *file, int line)
 	iounmap(addr);
 }
 
-#define PROC_READ_BUFFER_SIZE 131072	/* size of the buffer to allocate to
-					 * hold all of /proc/XXX/info */
+#define DEBUGFS_READ_BUFFER_SIZE 131072	/* size of the buffer to allocate to
+				 * hold all of /proc/XXX/info */
 int uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining,
 			     char *format, ...);
 
diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 7c87452..5785eb3 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -1186,12 +1186,12 @@ info_debugfs_read(struct file *file, char __user *buf,
 {
 	char *temp;
 	int totalBytes = 0;
-	int remaining_bytes = PROC_READ_BUFFER_SIZE;
+	int remaining_bytes = DEBUGFS_READ_BUFFER_SIZE;
 
 /* *start = buf; */
 	if (ProcReadBuffer == NULL) {
 		DBGINF("ProcReadBuffer == NULL; allocating buffer.\n.");
-		ProcReadBuffer = vmalloc(PROC_READ_BUFFER_SIZE);
+		ProcReadBuffer = vmalloc(DEBUGFS_READ_BUFFER_SIZE);
 
 		if (ProcReadBuffer == NULL) {
 			LOGERR("failed to allocate buffer to provide proc data.\n");
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 03/10] staging: unisys: simpleString_get & byteStream_get camel case
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (3 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 2/4] staging: unisys: uisutils.h and uisutils.c proc code Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 3/4] staging: unisys: timskmod proc code Jeffrey Brown
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed the camel case for parser_byteStream_get and
parser_simpleString_get
parser_simpleString_get => parser_simplestring_get
parser_byteStream_get => parser_bytestream_get

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 drivers/staging/unisys/visorchipset/parser.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 8cd3b4f..50180f3 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -174,7 +174,7 @@ parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 /* Obtain '\0'-terminated copy of string in payload area.
  */
 char *
-parser_simpleString_get(PARSER_CONTEXT *ctx)
+parser_simplestring_get(PARSER_CONTEXT *ctx)
 {
 	if (!ctx->byte_stream)
 		return NULL;
@@ -186,7 +186,7 @@ parser_simpleString_get(PARSER_CONTEXT *ctx)
 /* Obtain a copy of the buffer in the payload area.
  */
 void *
-parser_byteStream_get(PARSER_CONTEXT *ctx, ulong *nbytes)
+parser_bytestream_get(PARSER_CONTEXT *ctx, ulong *nbytes)
 {
 	if (!ctx->byte_stream)
 		return NULL;
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index 10b922e..fa12df8 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -36,13 +36,13 @@ typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
 PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL is_local,
 			    BOOL *try_again);
 PARSER_CONTEXT  *parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local,
-				       BOOL *try_again);
+					BOOL *try_again);
 void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
 void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize);
 void *parser_string_get(PARSER_CONTEXT *ctx);
 uuid_le parser_id_get(PARSER_CONTEXT *ctx);
-char *parser_simpleString_get(PARSER_CONTEXT *ctx);
-void *parser_byteStream_get(PARSER_CONTEXT *ctx, ulong *nbytes);
+char *parser_simplestring_get(PARSER_CONTEXT *ctx);
+void *parser_bytestream_get(PARSER_CONTEXT *ctx, ulong *nbytes);
 void parser_done(PARSER_CONTEXT *ctx);
 
 #endif
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 3/4] staging: unisys: timskmod proc code
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (4 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 03/10] staging: unisys: simpleString_get & byteStream_get camel case Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 04/10] staging: unisys: PARSER_CONTEXT typedef Jeffrey Brown
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

This one was a little weird. I replaced all code implemented from
the procobjecttree.h with debugfs code, then deleted
procobjecttree.h and procobjecttree.c.  After that I removed the

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/include/procobjecttree.h    |  48 ---
 drivers/staging/unisys/include/timskmod.h          |   1 -
 drivers/staging/unisys/visorchipset/visorchipset.h |   6 +-
 .../unisys/visorchipset/visorchipset_main.c        |   7 +-
 drivers/staging/unisys/visorutil/procobjecttree.c  | 352 ---------------------
 5 files changed, 6 insertions(+), 408 deletions(-)
 delete mode 100644 drivers/staging/unisys/include/procobjecttree.h
 delete mode 100644 drivers/staging/unisys/visorutil/procobjecttree.c

diff --git a/drivers/staging/unisys/include/procobjecttree.h b/drivers/staging/unisys/include/procobjecttree.h
deleted file mode 100644
index 1174056..0000000
--- a/drivers/staging/unisys/include/procobjecttree.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* procobjecttree.h
- *
- * Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- */
-
-/** @file *********************************************************************
- *
- *  This describes the interfaces necessary for creating a tree of types,
- *  objects, and properties in /proc.
- *
- ******************************************************************************
- */
-
-#ifndef __PROCOBJECTTREE_H__
-#define __PROCOBJECTTREE_H__
-
-#include "uniklog.h"
-#include "timskmod.h"
-
-/* These are opaque structures to users.
- * Fields are declared only in the implementation .c files.
- */
-typedef struct MYPROCOBJECT_Tag MYPROCOBJECT;
-typedef struct MYPROCTYPE_Tag   MYPROCTYPE;
-
-MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type, const char *name,
-				      void *context);
-void          visor_proc_DestroyObject(MYPROCOBJECT *obj);
-MYPROCTYPE   *visor_proc_CreateType(struct proc_dir_entry *procRootDir,
-				    const char **name,
-				    const char **propertyNames,
-				    void (*show_property)(struct seq_file *,
-							  void *, int));
-void          visor_proc_DestroyType(MYPROCTYPE *type);
-
-#endif
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index de11f44..c47396e 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -34,7 +34,6 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/vmalloc.h>
-#include <linux/proc_fs.h>
 #include <linux/cdev.h>
 #include <linux/types.h>
 #include <asm/irq.h>
diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index 46dad63..b794982 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -24,7 +24,7 @@
 #include "channel.h"
 #include "controlvmchannel.h"
 #include "parser.h"
-#include "procobjecttree.h"
+#include <linux/debugfs.h>
 #include "vbusdeviceinfo.h"
 #include "vbushelper.h"
 
@@ -133,7 +133,7 @@ struct visorchipset_bus_info {
 	u8 *description;	/* UTF8 */
 	u64 reserved1;
 	u32 reserved2;
-	MYPROCOBJECT *proc_object;
+	struct dentry *debugfs_object;
 	struct {
 		u32 server:1;
 		/* Add new fields above. */
@@ -209,7 +209,7 @@ struct visorchipset_internalport_info {
 	u64 reserved1;
 	u32 reserved2;		/* CONTROLVM_ID */
 	struct controlvm_message_header pending_msg_hdr;
-	MYPROCOBJECT *proc_object;
+	struct dentry *debugfs_object;
 
 };
 
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index c8f7bea..fa94e26 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -17,7 +17,6 @@
 
 #include "globals.h"
 #include "visorchipset.h"
-#include "procobjecttree.h"
 #include "visorchannel.h"
 #include "periodic_work.h"
 #include "testing.h"
@@ -544,9 +543,9 @@ busInfo_clear(void *v)
 {
 	struct visorchipset_bus_info *p = (struct visorchipset_bus_info *) (v);
 
-	if (p->proc_object) {
-		visor_proc_DestroyObject(p->proc_object);
-		p->proc_object = NULL;
+	if (p->debugfs_object) {
+		debugfs_remove(p->debugfs_object);
+		p->debugfs_object = NULL;
 	}
 	kfree(p->name);
 	p->name = NULL;
diff --git a/drivers/staging/unisys/visorutil/procobjecttree.c b/drivers/staging/unisys/visorutil/procobjecttree.c
deleted file mode 100644
index 195772d..0000000
--- a/drivers/staging/unisys/visorutil/procobjecttree.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* procobjecttree.c
- *
- * Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- */
-
-#include "procobjecttree.h"
-
-#define MYDRVNAME "procobjecttree"
-
-
-
-/** This is context info that we stash in each /proc file entry, which we
- *  need in order to call the callback function that supplies the /proc read
- *  info for that file.
- */
-typedef struct {
-	void (*show_property)(struct seq_file *, void *, int);
-	MYPROCOBJECT *procObject;
-	int propertyIndex;
-
-} PROCDIRENTRYCONTEXT;
-
-/** This describes the attributes of a tree rooted at
- *  <procDirRoot>/<name[0]>/<name[1]>/...
- *  Properties for each object of this type will be located under
- *  <procDirRoot>/<name[0]>/<name[1]>/.../<objectName>/<propertyName>.
- */
-struct MYPROCTYPE_Tag {
-	const char **name;  /**< node names for this type, ending with NULL */
-	int nNames;         /**< num of node names in <name> */
-
-	/** root dir for this type tree in /proc */
-	struct proc_dir_entry *procDirRoot;
-
-	struct proc_dir_entry **procDirs;  /**< for each node in <name> */
-
-	/** bottom dir where objects will be rooted; i.e., this is
-	 *  <procDirRoot>/<name[0]>/<name[1]>/.../, which is the same as the
-	 *  last entry in the <procDirs> array. */
-	struct proc_dir_entry *procDir;
-
-	/** name for each property that objects of this type can have */
-	const char **propertyNames;
-
-	int nProperties;       /**< num of names in <propertyNames> */
-
-	/** Call this, passing MYPROCOBJECT.context and the property index
-	 *  whenever someone reads the proc entry */
-	void (*show_property)(struct seq_file *, void *, int);
-};
-
-
-
-struct MYPROCOBJECT_Tag {
-	MYPROCTYPE *type;
-
-	/** This is the name of the dir node in /proc under which the
-	 *  properties of this object will appear as files. */
-	char *name;
-
-	int namesize;   /**< number of bytes allocated for name */
-	void *context;  /**< passed to MYPROCTYPE.show_property */
-
-	/** <type.procDirRoot>/<type.name[0]>/<type.name[1]>/.../<name> */
-	struct proc_dir_entry *procDir;
-
-	/** a proc dir entry for each of the properties of the object;
-	 *  properties are identified in MYPROCTYPE.propertyNames, so each of
-	 *  the <procDirProperties> describes a single file like
-	 *  <type.procDirRoot>/<type.name[0]>/<type.name[1]>/...
-	 *           /<name>/<propertyName>
-	 */
-	struct proc_dir_entry **procDirProperties;
-
-	/** this is a holding area for the context information that is needed
-	 *  to run the /proc callback function */
-	PROCDIRENTRYCONTEXT *procDirPropertyContexts;
-};
-
-
-
-static struct proc_dir_entry *
-createProcDir(const char *name, struct proc_dir_entry *parent)
-{
-	struct proc_dir_entry *p = proc_mkdir_mode(name, S_IFDIR, parent);
-
-	if (p == NULL)
-		ERRDRV("failed to create /proc directory %s", name);
-	return p;
-}
-
-static struct proc_dir_entry *
-createProcFile(const char *name, struct proc_dir_entry *parent,
-	       const struct file_operations *fops, void *data)
-{
-	struct proc_dir_entry *p = proc_create_data(name, 0, parent,
-						    fops, data);
-	if (p == NULL)
-		ERRDRV("failed to create /proc file %s", name);
-	return p;
-}
-
-static int seq_show(struct seq_file *seq, void *offset);
-static int proc_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, seq_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_fops = {
-	.open = proc_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
-
-
-
-MYPROCTYPE *visor_proc_CreateType(struct proc_dir_entry *procDirRoot,
-				  const char **name,
-				  const char **propertyNames,
-				  void (*show_property)(struct seq_file *,
-							void *, int))
-{
-	int i = 0;
-	MYPROCTYPE *rc = NULL, *type = NULL;
-	struct proc_dir_entry *parent = NULL;
-
-	if (procDirRoot == NULL) {
-		ERRDRV("procDirRoot cannot be NULL!\n");
-		goto Away;
-	}
-	if (name == NULL || name[0] == NULL) {
-		ERRDRV("name must contain at least 1 node name!\n");
-		goto Away;
-	}
-	type = kzalloc(sizeof(MYPROCTYPE), GFP_KERNEL | __GFP_NORETRY);
-	if (type == NULL) {
-		ERRDRV("out of memory\n");
-		goto Away;
-	}
-	type->name = name;
-	type->propertyNames = propertyNames;
-	type->nProperties = 0;
-	type->nNames = 0;
-	type->show_property = show_property;
-	type->procDirRoot = procDirRoot;
-	if (type->propertyNames != NULL)
-		while (type->propertyNames[type->nProperties] != NULL)
-			type->nProperties++;
-	while (type->name[type->nNames] != NULL)
-		type->nNames++;
-	type->procDirs = kzalloc((type->nNames + 1) *
-				 sizeof(struct proc_dir_entry *),
-				 GFP_KERNEL | __GFP_NORETRY);
-	if (type->procDirs == NULL) {
-		ERRDRV("out of memory\n");
-		goto Away;
-	}
-	parent = procDirRoot;
-	for (i = 0; i < type->nNames; i++) {
-		type->procDirs[i] = createProcDir(type->name[i], parent);
-		if (type->procDirs[i] == NULL) {
-			rc = NULL;
-			goto Away;
-		}
-		parent = type->procDirs[i];
-	}
-	type->procDir = type->procDirs[type->nNames-1];
-	rc = type;
-Away:
-	if (rc == NULL) {
-		if (type != NULL) {
-			visor_proc_DestroyType(type);
-			type = NULL;
-		}
-	}
-	return rc;
-}
-EXPORT_SYMBOL_GPL(visor_proc_CreateType);
-
-
-
-void visor_proc_DestroyType(MYPROCTYPE *type)
-{
-	if (type == NULL)
-		return;
-	if (type->procDirs != NULL) {
-		int i = type->nNames-1;
-
-		while (i >= 0) {
-			if (type->procDirs[i] != NULL) {
-				struct proc_dir_entry *parent = NULL;
-
-				if (i == 0)
-					parent = type->procDirRoot;
-				else
-					parent = type->procDirs[i-1];
-				remove_proc_entry(type->name[i], parent);
-			}
-			i--;
-		}
-		kfree(type->procDirs);
-		type->procDirs = NULL;
-	}
-	kfree(type);
-}
-EXPORT_SYMBOL_GPL(visor_proc_DestroyType);
-
-
-
-MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type,
-				      const char *name, void *context)
-{
-	MYPROCOBJECT *obj = NULL, *rc = NULL;
-	int i = 0;
-
-	if (type == NULL) {
-		ERRDRV("type cannot be NULL\n");
-		goto Away;
-	}
-	obj = kzalloc(sizeof(MYPROCOBJECT), GFP_KERNEL | __GFP_NORETRY);
-	if (obj == NULL) {
-		ERRDRV("out of memory\n");
-		goto Away;
-	}
-	obj->type = type;
-	obj->context = context;
-	if (name == NULL) {
-		obj->name = NULL;
-		obj->procDir = type->procDir;
-	} else {
-		obj->namesize = strlen(name)+1;
-		obj->name = kmalloc(obj->namesize, GFP_KERNEL | __GFP_NORETRY);
-		if (obj->name == NULL) {
-			obj->namesize = 0;
-			ERRDRV("out of memory\n");
-			goto Away;
-		}
-		strcpy(obj->name, name);
-		obj->procDir = createProcDir(obj->name, type->procDir);
-		if (obj->procDir == NULL)
-			goto Away;
-	}
-	obj->procDirPropertyContexts =
-		kzalloc((type->nProperties + 1) * sizeof(PROCDIRENTRYCONTEXT),
-			GFP_KERNEL | __GFP_NORETRY);
-	if (obj->procDirPropertyContexts == NULL) {
-		ERRDRV("out of memory\n");
-		goto Away;
-	}
-	obj->procDirProperties =
-		kzalloc((type->nProperties + 1) * sizeof(struct proc_dir_entry *),
-			GFP_KERNEL | __GFP_NORETRY);
-	if (obj->procDirProperties == NULL) {
-		ERRDRV("out of memory\n");
-		goto Away;
-	}
-	for (i = 0; i < type->nProperties; i++) {
-		obj->procDirPropertyContexts[i].procObject = obj;
-		obj->procDirPropertyContexts[i].propertyIndex = i;
-		obj->procDirPropertyContexts[i].show_property =
-			type->show_property;
-		if (type->propertyNames[i][0] != '\0') {
-			/* only create properties that have names */
-			obj->procDirProperties[i] =
-				createProcFile(type->propertyNames[i],
-					       obj->procDir, &proc_fops,
-					       &obj->procDirPropertyContexts[i]);
-			if (obj->procDirProperties[i] == NULL) {
-				rc = NULL;
-				goto Away;
-			}
-		}
-	}
-	rc = obj;
-Away:
-	if (rc == NULL) {
-		if (obj != NULL) {
-			visor_proc_DestroyObject(obj);
-			obj = NULL;
-		}
-	}
-	return rc;
-}
-EXPORT_SYMBOL_GPL(visor_proc_CreateObject);
-
-
-
-void visor_proc_DestroyObject(MYPROCOBJECT *obj)
-{
-	MYPROCTYPE *type = NULL;
-
-	if (obj == NULL)
-		return;
-	type = obj->type;
-	if (type == NULL)
-		return;
-	if (obj->procDirProperties != NULL) {
-		int i = 0;
-
-		for (i = 0; i < type->nProperties; i++) {
-			if (obj->procDirProperties[i] != NULL) {
-				remove_proc_entry(type->propertyNames[i],
-						  obj->procDir);
-				obj->procDirProperties[i] = NULL;
-			}
-		}
-		kfree(obj->procDirProperties);
-		obj->procDirProperties = NULL;
-	}
-
-	kfree(obj->procDirPropertyContexts);
-	obj->procDirPropertyContexts = NULL;
-
-	if (obj->procDir != NULL) {
-		if (obj->name != NULL)
-			remove_proc_entry(obj->name, type->procDir);
-		obj->procDir = NULL;
-	}
-
-	kfree(obj->name);
-	obj->name = NULL;
-	kfree(obj);
-}
-EXPORT_SYMBOL_GPL(visor_proc_DestroyObject);
-
-
-
-static int seq_show(struct seq_file *seq, void *offset)
-{
-	PROCDIRENTRYCONTEXT *ctx = (PROCDIRENTRYCONTEXT *)(seq->private);
-
-	if (ctx == NULL) {
-		ERRDRV("I don't have a freakin' clue...");
-		return 0;
-	}
-	(*ctx->show_property)(seq, ctx->procObject->context,
-			      ctx->propertyIndex);
-	return 0;
-}
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 04/10] staging: unisys: PARSER_CONTEXT typedef
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (5 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 3/4] staging: unisys: timskmod proc code Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 4/4] staging: unisys: uislib.c proc code Jeffrey Brown
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Completely removed all trace of the typedef of PARSER_CONTEXT
and replaced all instance of that typedef with parser_context_tag
also changed PARSER_CONTEXT_Tag
PARSER_CONTEXT_Tag => parser_context_tag

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c       | 29 +++++++++++-----------
 drivers/staging/unisys/visorchipset/parser.h       | 26 +++++++++----------
 .../unisys/visorchipset/visorchipset_main.c        | 10 +++++---
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 50180f3..4a880b8 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -31,7 +31,7 @@
 #define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128)
 static ulong Controlvm_Payload_Bytes_Buffered;
 
-struct PARSER_CONTEXT_Tag {
+struct parser_context_tag {
 	ulong allocbytes;
 	ulong param_bytes;
 	u8 *curr;
@@ -40,13 +40,13 @@ struct PARSER_CONTEXT_Tag {
 	char data[0];
 };
 
-static PARSER_CONTEXT *
+static struct parser_context_tag *
 parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		 BOOL hasStandardPayloadHeader, BOOL *tryAgain)
 {
-	int allocbytes = sizeof(PARSER_CONTEXT) + bytes;
-	PARSER_CONTEXT *rc = NULL;
-	PARSER_CONTEXT *ctx = NULL;
+	int allocbytes = sizeof(struct parser_context_tag) + bytes;
+	struct parser_context_tag *rc = NULL;
+	struct parser_context_tag *ctx = NULL;
 	struct memregion *rgn = NULL;
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
@@ -154,7 +154,7 @@ Away:
 	return rc;
 }
 
-PARSER_CONTEXT *
+struct parser_context_tag *
 parser_init(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 {
 	return parser_init_guts(addr, bytes, is_local, TRUE, try_again);
@@ -165,7 +165,7 @@ parser_init(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
  * structures.  Afterwards, you can call parser_simpleString_get() or
  * parser_byteStream_get() to obtain the data.
  */
-PARSER_CONTEXT *
+struct parser_context_tag *
 parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 {
 	return parser_init_guts(addr, bytes, is_local, FALSE, try_again);
@@ -174,7 +174,7 @@ parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local, BOOL *try_again)
 /* Obtain '\0'-terminated copy of string in payload area.
  */
 char *
-parser_simplestring_get(PARSER_CONTEXT *ctx)
+parser_simplestring_get(struct parser_context_tag *ctx)
 {
 	if (!ctx->byte_stream)
 		return NULL;
@@ -186,7 +186,7 @@ parser_simplestring_get(PARSER_CONTEXT *ctx)
 /* Obtain a copy of the buffer in the payload area.
  */
 void *
-parser_bytestream_get(PARSER_CONTEXT *ctx, ulong *nbytes)
+parser_bytestream_get(struct parser_context_tag *ctx, ulong *nbytes)
 {
 	if (!ctx->byte_stream)
 		return NULL;
@@ -196,7 +196,7 @@ parser_bytestream_get(PARSER_CONTEXT *ctx, ulong *nbytes)
 }
 
 uuid_le
-parser_id_get(PARSER_CONTEXT *ctx)
+parser_id_get(struct parser_context_tag *ctx)
 {
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
@@ -210,7 +210,8 @@ parser_id_get(PARSER_CONTEXT *ctx)
 }
 
 void
-parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string)
+parser_param_start(struct parser_context_tag *ctx,
+		   PARSER_WHICH_STRING which_string)
 {
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
@@ -247,7 +248,7 @@ Away:
 }
 
 void
-parser_done(PARSER_CONTEXT *ctx)
+parser_done(struct parser_context_tag *ctx)
 {
 	if (!ctx)
 		return;
@@ -290,7 +291,7 @@ string_length_no_trail(char *s, int len)
  *    parameter
  */
 void *
-parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize)
+parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize)
 {
 	u8 *pscan, *pnam = nam;
 	ulong nscan;
@@ -446,7 +447,7 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize)
 }
 
 void *
-parser_string_get(PARSER_CONTEXT *ctx)
+parser_string_get(struct parser_context_tag *ctx)
 {
 	u8 *pscan;
 	ulong nscan;
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index fa12df8..de3f37b 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -31,18 +31,18 @@ typedef enum {
 	PARSERSTRING_NAME,
 } PARSER_WHICH_STRING;
 
-typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
-
-PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL is_local,
-			    BOOL *try_again);
-PARSER_CONTEXT  *parser_init_bytestream(u64 addr, u32 bytes, BOOL is_local,
-					BOOL *try_again);
-void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
-void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize);
-void *parser_string_get(PARSER_CONTEXT *ctx);
-uuid_le parser_id_get(PARSER_CONTEXT *ctx);
-char *parser_simplestring_get(PARSER_CONTEXT *ctx);
-void *parser_bytestream_get(PARSER_CONTEXT *ctx, ulong *nbytes);
-void parser_done(PARSER_CONTEXT *ctx);
+struct parser_context_tag *parser_init(u64 addr, u32 bytes, BOOL is_local,
+				       BOOL *try_again);
+struct parser_context_tag *parser_init_bytestream(u64 addr, u32 bytes,
+						  BOOL is_local,
+						  BOOL *try_again);
+void parser_param_start(struct parser_context_tag *ctx,
+			PARSER_WHICH_STRING which_string);
+void *parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize);
+void *parser_string_get(struct parser_context_tag *ctx);
+uuid_le parser_id_get(struct parser_context_tag *ctx);
+char *parser_simplestring_get(struct parser_context_tag *ctx);
+void *parser_bytestream_get(struct parser_context_tag *ctx, ulong *nbytes);
+void parser_done(struct parser_context_tag *ctx);
 
 #endif
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 5010c65..944c46e 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -151,7 +151,8 @@ static const char Putfile_buffer_list_pool_name[] =
  */
 struct putfile_buffer_entry {
 	struct list_head next;	/* putfile_buffer_entry list */
-	PARSER_CONTEXT *parser_ctx; /* points to buffer containing input data */
+	struct parser_context_tag *parser_ctx; /* points to buffer containing
+						input data */
 };
 
 /* List of struct putfile_request *, via next_putfile_request member.
@@ -166,7 +167,7 @@ static LIST_HEAD(Putfile_request_list);
  */
 struct putfile_active_buffer {
 	/* a payload from a controlvm message, containing a file data buffer */
-	PARSER_CONTEXT *parser_ctx;
+	struct parser_context_tag *parser_ctx;
 	/* points within data area of parser_ctx to next byte of data */
 	u8 *pnext;
 	/* # bytes left from <pnext> to the end of this data buffer */
@@ -1181,7 +1182,8 @@ Away:
 }
 
 static void
-bus_configure(struct controlvm_message *inmsg, PARSER_CONTEXT *parser_ctx)
+bus_configure(struct controlvm_message *inmsg,
+	      struct parser_context_tag *parser_ctx)
 {
 	struct controlvm_message_packet *cmd = &inmsg->cmd;
 	ulong busNo = cmd->configure_bus.bus_no;
@@ -1790,7 +1792,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
 	struct controlvm_message_packet *cmd = &inmsg.cmd;
 	u64 parametersAddr = 0;
 	u32 parametersBytes = 0;
-	PARSER_CONTEXT *parser_ctx = NULL;
+	struct parser_context_tag *parser_ctx = NULL;
 	BOOL isLocalAddr = FALSE;
 	struct controlvm_message ackmsg;
 
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 4/4] staging: unisys: uislib.c proc code
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (6 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 04/10] staging: unisys: PARSER_CONTEXT typedef Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 05/10] staging: unisys: PARSER_WHICH_STRING typedef Jeffrey Brown
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Removed proc code from the file uislib.c, the main changes that
removed the proc utility, was the defines, and the include
statement in the beginning.
CALLHOME_PROC_ENTRY_FN => CALLHOME_DEBUGFS_ENTRY_FN
CALLHOME_THROTTLED_PROC_ENTRY_FN => CALLHOME_THROTTLED_PROC_ENTRY_FN
ProcReadBufferValid => DebugfsReadBufferValid
ProcReadBuffer => DebugfsReadBuffer

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/uislib/uislib.c | 36 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 5785eb3..c176264 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -34,7 +34,7 @@
 #include "uisutils.h"
 #include "vbuschannel.h"
 
-#include <linux/proc_fs.h>
+#include <linux/debugfs.h>
 #include <linux/uaccess.h>	/* for copy_from_user */
 #include <linux/ctype.h>	/* for toupper */
 #include <linux/list.h>
@@ -45,7 +45,7 @@
 #include "version.h"
 #include "guestlinuxdebug.h"
 
-#define SET_PROC_OWNER(x, y)
+#define SET_DEBUGFS_OWNER(x, y)
 
 #define POLLJIFFIES_NORMAL 1
 /* Choose whether or not you want to wakeup the request-polling thread
@@ -59,8 +59,8 @@
 /* global function pointers that act as callback functions into virtpcimod */
 int (*virt_control_chan_func)(struct guest_msgs *);
 
-static int ProcReadBufferValid;
-static char *ProcReadBuffer;	/* Note this MUST be global,
+static int DebugfsReadBufferValid;
+static char *DebugfsReadBuffer;	/* Note this MUST be global,
 					 * because the contents must */
 static unsigned int chipset_inited;
 
@@ -90,8 +90,8 @@ static DEFINE_SEMAPHORE(Lock_Polling_Device_Channels);	/* unlocked */
 static DECLARE_WAIT_QUEUE_HEAD(Wakeup_Polling_Device_Channels);
 static int Go_Polling_Device_Channels;
 
-#define CALLHOME_PROC_ENTRY_FN "callhome"
-#define CALLHOME_THROTTLED_PROC_ENTRY_FN "callhome_throttled"
+#define CALLHOME_DEBUGFS_ENTRY_FN "callhome"
+#define CALLHOME_THROTTLED_DEBUGFS_ENTRY_FN "callhome_throttled"
 
 #define DIR_DEBUGFS_ENTRY "uislib"
 static struct dentry *dir_debugfs;
@@ -1189,28 +1189,28 @@ info_debugfs_read(struct file *file, char __user *buf,
 	int remaining_bytes = DEBUGFS_READ_BUFFER_SIZE;
 
 /* *start = buf; */
-	if (ProcReadBuffer == NULL) {
-		DBGINF("ProcReadBuffer == NULL; allocating buffer.\n.");
-		ProcReadBuffer = vmalloc(DEBUGFS_READ_BUFFER_SIZE);
+	if (DebugfsReadBuffer == NULL) {
+		DBGINF("DebugfsReadBuffer == NULL; allocating buffer.\n.");
+		DebugfsReadBuffer = vmalloc(DEBUGFS_READ_BUFFER_SIZE);
 
-		if (ProcReadBuffer == NULL) {
+		if (DebugfsReadBuffer == NULL) {
 			LOGERR("failed to allocate buffer to provide proc data.\n");
 			return -ENOMEM;
 		}
 	}
 
-	temp = ProcReadBuffer;
+	temp = DebugfsReadBuffer;
 
-	if ((*offset == 0) || (!ProcReadBufferValid)) {
+	if ((*offset == 0) || (!DebugfsReadBufferValid)) {
 		DBGINF("calling info_debugfs_read_helper.\n");
 		/* if the read fails, then -1 will be returned */
 		totalBytes = info_debugfs_read_helper(&temp, &remaining_bytes);
-		ProcReadBufferValid = 1;
+		DebugfsReadBufferValid = 1;
 	} else
-		totalBytes = strlen(ProcReadBuffer);
+		totalBytes = strlen(DebugfsReadBuffer);
 
 	return simple_read_from_buffer(buf, len, offset,
-				       ProcReadBuffer, totalBytes);
+				       DebugfsReadBuffer, totalBytes);
 }
 
 static struct device_info *
@@ -1533,9 +1533,9 @@ uislib_mod_init(void)
 static void __exit
 uislib_mod_exit(void)
 {
-	if (ProcReadBuffer) {
-		vfree(ProcReadBuffer);
-		ProcReadBuffer = NULL;
+	if (DebugfsReadBuffer) {
+		vfree(DebugfsReadBuffer);
+		DebugfsReadBuffer = NULL;
 	}
 
 	debugfs_remove(info_debugfs_entry);
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 05/10] staging: unisys: PARSER_WHICH_STRING typedef
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (7 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 4/4] staging: unisys: uislib.c proc code Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 06/10] staging: unisys: Controlvm_Payload_Bytes_Buffered camel case Jeffrey Brown
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Removed the typedef of PARSER_WHICH_STRING and replaced all
instance of the typedef with enum parser_which_string. Also
changed the name of it to parser_which_string
PARSER_WHICH_STRING => parser_which_string

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 2 +-
 drivers/staging/unisys/visorchipset/parser.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 4a880b8..fad3fdb 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -211,7 +211,7 @@ parser_id_get(struct parser_context_tag *ctx)
 
 void
 parser_param_start(struct parser_context_tag *ctx,
-		   PARSER_WHICH_STRING which_string)
+		   enum parser_which_string which_string)
 {
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index de3f37b..5b802fc 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -24,12 +24,12 @@
 #include "timskmod.h"
 #include "channel.h"
 
-typedef enum {
+enum parser_which_string {
 	PARSERSTRING_INITIATOR,
 	PARSERSTRING_TARGET,
 	PARSERSTRING_CONNECTION,
 	PARSERSTRING_NAME,
-} PARSER_WHICH_STRING;
+};
 
 struct parser_context_tag *parser_init(u64 addr, u32 bytes, BOOL is_local,
 				       BOOL *try_again);
@@ -37,7 +37,7 @@ struct parser_context_tag *parser_init_bytestream(u64 addr, u32 bytes,
 						  BOOL is_local,
 						  BOOL *try_again);
 void parser_param_start(struct parser_context_tag *ctx,
-			PARSER_WHICH_STRING which_string);
+			enum parser_which_string which_string);
 void *parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize);
 void *parser_string_get(struct parser_context_tag *ctx);
 uuid_le parser_id_get(struct parser_context_tag *ctx);
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 06/10] staging: unisys: Controlvm_Payload_Bytes_Buffered camel case
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (8 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 05/10] staging: unisys: PARSER_WHICH_STRING typedef Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 07/10] staging: unisys: parser_init_guts and parser_param_start " Jeffrey Brown
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Changed the camel case of the static ulong Controlvm_Payload_Bytes_
Buffered
Controlvm_Payload_Bytes_Buffered =>controlvm_payload_bytes_buffered

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index fad3fdb..88abbeb 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -29,7 +29,7 @@
  * incoming payloads.  This serves as a throttling mechanism.
  */
 #define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128)
-static ulong Controlvm_Payload_Bytes_Buffered;
+static ulong controlvm_payload_bytes_buffered;
 
 struct parser_context_tag {
 	ulong allocbytes;
@@ -57,7 +57,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		 * '\0'-terminated
 		 */
 		allocbytes++;
-	if ((Controlvm_Payload_Bytes_Buffered + bytes)
+	if ((controlvm_payload_bytes_buffered + bytes)
 	    > MAX_CONTROLVM_PAYLOAD_BYTES) {
 		ERRDRV("%s (%s:%d) - prevented allocation of %d bytes to prevent exceeding throttling max (%d)",
 		       __func__, __FILE__, __LINE__, allocbytes,
@@ -144,7 +144,7 @@ Away:
 		rgn = NULL;
 	}
 	if (rc)
-		Controlvm_Payload_Bytes_Buffered += ctx->param_bytes;
+		controlvm_payload_bytes_buffered += ctx->param_bytes;
 	else {
 		if (ctx) {
 			parser_done(ctx);
@@ -252,7 +252,7 @@ parser_done(struct parser_context_tag *ctx)
 {
 	if (!ctx)
 		return;
-	Controlvm_Payload_Bytes_Buffered -= ctx->param_bytes;
+	controlvm_payload_bytes_buffered -= ctx->param_bytes;
 	kfree(ctx);
 }
 
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 07/10] staging: unisys: parser_init_guts and parser_param_start camel case
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (9 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 06/10] staging: unisys: Controlvm_Payload_Bytes_Buffered camel case Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 08/10] staging: unisys: parser.c space after casts Jeffrey Brown
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed camel cases in the struct parser_init_guts and an Away camel
case in parser_param_start
isLocal => is_local
tryAgain => try_again
HasStandardPayloadHeader => has_standard_payload_header
Away => cleanups

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 46 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 88abbeb..02cacec 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -41,8 +41,8 @@ struct parser_context_tag {
 };
 
 static struct parser_context_tag *
-parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
-		 BOOL hasStandardPayloadHeader, BOOL *tryAgain)
+parser_init_guts(u64 addr, u32 bytes, BOOL is_local,
+		 BOOL has_standard_payload_header, BOOL *try_again)
 {
 	int allocbytes = sizeof(struct parser_context_tag) + bytes;
 	struct parser_context_tag *rc = NULL;
@@ -50,9 +50,9 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 	struct memregion *rgn = NULL;
 	struct spar_controlvm_parameters_header *phdr = NULL;
 
-	if (tryAgain)
-		*tryAgain = FALSE;
-	if (!hasStandardPayloadHeader)
+	if (try_again)
+		*try_again = FALSE;
+	if (!has_standard_payload_header)
 		/* alloc and 0 extra byte to ensure payload is
 		 * '\0'-terminated
 		 */
@@ -62,19 +62,19 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		ERRDRV("%s (%s:%d) - prevented allocation of %d bytes to prevent exceeding throttling max (%d)",
 		       __func__, __FILE__, __LINE__, allocbytes,
 		       MAX_CONTROLVM_PAYLOAD_BYTES);
-		if (tryAgain)
-			*tryAgain = TRUE;
+		if (try_again)
+			*try_again = TRUE;
 		rc = NULL;
-		goto Away;
+		goto cleanups;
 	}
 	ctx = kzalloc(allocbytes, GFP_KERNEL|__GFP_NORETRY);
 	if (ctx == NULL) {
 		ERRDRV("%s (%s:%d) - failed to allocate %d bytes",
 		       __func__, __FILE__, __LINE__, allocbytes);
-		if (tryAgain)
-			*tryAgain = TRUE;
+		if (try_again)
+			*try_again = TRUE;
 		rc = NULL;
-		goto Away;
+		goto cleanups;
 	}
 
 	ctx->allocbytes = allocbytes;
@@ -82,7 +82,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 	ctx->curr = NULL;
 	ctx->bytes_remaining = 0;
 	ctx->byte_stream = FALSE;
-	if (isLocal) {
+	if (is_local) {
 		void *p;
 
 		if (addr > virt_to_phys(high_memory - 1)) {
@@ -90,7 +90,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 			       __func__,
 			       (unsigned long long) addr, (ulong) bytes);
 			rc = NULL;
-			goto Away;
+			goto cleanups;
 		}
 		p = __va((ulong) (addr));
 		memcpy(ctx->data, p, bytes);
@@ -98,17 +98,17 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		rgn = visor_memregion_create(addr, bytes);
 		if (!rgn) {
 			rc = NULL;
-			goto Away;
+			goto cleanups;
 		}
 		if (visor_memregion_read(rgn, 0, ctx->data, bytes) < 0) {
 			rc = NULL;
-			goto Away;
+			goto cleanups;
 		}
 	}
-	if (!hasStandardPayloadHeader) {
+	if (!has_standard_payload_header) {
 		ctx->byte_stream = TRUE;
 		rc = ctx;
-		goto Away;
+		goto cleanups;
 	}
 	phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
 	if (phdr->total_length != bytes) {
@@ -116,7 +116,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		       __func__,
 		       (ulong) (phdr->total_length), (ulong) (bytes));
 		rc = NULL;
-		goto Away;
+		goto cleanups;
 	}
 	if (phdr->total_length < phdr->header_length) {
 		ERRDRV("%s - total length < header length (%lu < %lu)",
@@ -124,7 +124,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		       (ulong) (phdr->total_length),
 		       (ulong) (phdr->header_length));
 		rc = NULL;
-		goto Away;
+		goto cleanups;
 	}
 	if (phdr->header_length <
 	    sizeof(struct spar_controlvm_parameters_header)) {
@@ -134,11 +134,11 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
 		       (ulong)(sizeof(
 				struct spar_controlvm_parameters_header)));
 		rc = NULL;
-		goto Away;
+		goto cleanups;
 	}
 
 	rc = ctx;
-Away:
+cleanups:
 	if (rgn) {
 		visor_memregion_destroy(rgn);
 		rgn = NULL;
@@ -218,7 +218,7 @@ parser_param_start(struct parser_context_tag *ctx,
 	if (ctx == NULL) {
 		ERRDRV("%s (%s:%d) - no context",
 		       __func__, __FILE__, __LINE__);
-		goto Away;
+		goto cleanups;
 	}
 	phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
 	switch (which_string) {
@@ -243,7 +243,7 @@ parser_param_start(struct parser_context_tag *ctx,
 		break;
 	}
 
-Away:
+cleanups:
 	return;
 }
 
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 08/10] staging: unisys: parser.c space after casts
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (10 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 07/10] staging: unisys: parser_init_guts and parser_param_start " Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 09/10] staging: unisys: parser.c braces Jeffrey Brown
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Removed all spaces after casts in parser.c

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 02cacec..17c1649 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -88,11 +88,11 @@ parser_init_guts(u64 addr, u32 bytes, BOOL is_local,
 		if (addr > virt_to_phys(high_memory - 1)) {
 			ERRDRV("%s - bad local address (0x%-16.16Lx for %lu)",
 			       __func__,
-			       (unsigned long long) addr, (ulong) bytes);
+			       (unsigned long long)addr, (ulong)bytes);
 			rc = NULL;
 			goto cleanups;
 		}
-		p = __va((ulong) (addr));
+		p = __va((ulong)(addr));
 		memcpy(ctx->data, p, bytes);
 	} else {
 		rgn = visor_memregion_create(addr, bytes);
@@ -114,15 +114,15 @@ parser_init_guts(u64 addr, u32 bytes, BOOL is_local,
 	if (phdr->total_length != bytes) {
 		ERRDRV("%s - bad total length %lu (should be %lu)",
 		       __func__,
-		       (ulong) (phdr->total_length), (ulong) (bytes));
+		       (ulong)(phdr->total_length), (ulong)(bytes));
 		rc = NULL;
 		goto cleanups;
 	}
 	if (phdr->total_length < phdr->header_length) {
 		ERRDRV("%s - total length < header length (%lu < %lu)",
 		       __func__,
-		       (ulong) (phdr->total_length),
-		       (ulong) (phdr->header_length));
+		       (ulong)(phdr->total_length),
+		       (ulong)(phdr->header_length));
 		rc = NULL;
 		goto cleanups;
 	}
@@ -130,7 +130,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL is_local,
 	    sizeof(struct spar_controlvm_parameters_header)) {
 		ERRDRV("%s - header is too small (%lu < %lu)",
 		       __func__,
-		       (ulong) (phdr->header_length),
+		       (ulong)(phdr->header_length),
 		       (ulong)(sizeof(
 				struct spar_controlvm_parameters_header)));
 		rc = NULL;
@@ -192,7 +192,7 @@ parser_bytestream_get(struct parser_context_tag *ctx, ulong *nbytes)
 		return NULL;
 	if (nbytes)
 		*nbytes = ctx->param_bytes;
-	return (void *) ctx->data;
+	return (void *)ctx->data;
 }
 
 uuid_le
@@ -407,7 +407,7 @@ parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize)
 	if (value == NULL)
 		return NULL;
 	memcpy(value, pscan, value_length);
-	((u8 *) (value))[value_length] = '\0';
+	((u8 *)(value))[value_length] = '\0';
 
 	pscan += orig_value_length;
 	nscan -= orig_value_length;
@@ -475,6 +475,6 @@ parser_string_get(struct parser_context_tag *ctx)
 		return NULL;
 	if (value_length > 0)
 		memcpy(value, pscan, value_length);
-	((u8 *) (value))[value_length] = '\0';
+	((u8 *)(value))[value_length] = '\0';
 	return value;
 }
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 09/10] staging: unisys: parser.c braces
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (11 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 08/10] staging: unisys: parser.c space after casts Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 12:26 ` [PATCH 10/10] staging: unisys: parser.c logical continuation Jeffrey Brown
  2014-12-01 14:38 ` [PATCH 00/10] parser header and c file patches Romer, Benjamin M
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Inserted a necessary brace for an if statement on line 146 of
parser.c

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 17c1649..6381e59 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -143,9 +143,9 @@ cleanups:
 		visor_memregion_destroy(rgn);
 		rgn = NULL;
 	}
-	if (rc)
+	if (rc) {
 		controlvm_payload_bytes_buffered += ctx->param_bytes;
-	else {
+	} else {
 		if (ctx) {
 			parser_done(ctx);
 			ctx = NULL;
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 10/10] staging: unisys: parser.c logical continuation
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (12 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 09/10] staging: unisys: parser.c braces Jeffrey Brown
@ 2014-12-01 12:26 ` Jeffrey Brown
  2014-12-01 14:38 ` [PATCH 00/10] parser header and c file patches Romer, Benjamin M
  14 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:26 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed a logical continuation on line 391 by placing the '||'
operator on line 390

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 6381e59..5f6a7b2 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -387,8 +387,8 @@ parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize)
 				break;
 			}
 		} else
-		    if (pscan[i] == ',' || pscan[i] == ';'
-			|| pscan[i] == '\0') {
+		    if (pscan[i] == ',' || pscan[i] == ';' ||
+			pscan[i] == '\0') {
 			value_length = i;
 			break;
 		}
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] parser header and c file patches
  2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
                   ` (13 preceding siblings ...)
  2014-12-01 12:26 ` [PATCH 10/10] staging: unisys: parser.c logical continuation Jeffrey Brown
@ 2014-12-01 14:38 ` Romer, Benjamin M
  14 siblings, 0 replies; 18+ messages in thread
From: Romer, Benjamin M @ 2014-12-01 14:38 UTC (permalink / raw)
  To: Brown, Jeffrey Darren; +Cc: gregkh, *S-Par-Maintainer, driverdev-devel

On Mon, 2014-12-01 at 07:26 -0500, Jeffrey Brown wrote:
> This series of patches made corrections to the camel casing and typedef
> problems in parser header and parser.c. There is a camel case in parser header
> where visorchipset_main.c was affected as well. Smaller problems like space
> after casts, braces, and logical coninuations in parser.c were solved as well.
> 
> Jeffrey Brown (10):
>   staging: unisys: parser_init camel cases
>   staging: unisys: parser_init_byteStream camel case
>   staging: unisys: simpleString_get & byteStream_get camel case
>   staging: unisys: PARSER_CONTEXT typedef
>   staging: unisys: PARSER_WHICH_STRING typedef
>   staging: unisys: Controlvm_Payload_Bytes_Buffered camel case
>   staging: unisys: parser_init_guts and parser_param_start camel case
>   staging: unisys: parser.c space after casts
>   staging: unisys: parser.c braces
>   staging: unisys: parser.c logical continuation
> 
>  drivers/staging/unisys/visorchipset/parser.c       | 117 +++++++++++----------
>  drivers/staging/unisys/visorchipset/parser.h       |  29 ++---
>  .../unisys/visorchipset/visorchipset_main.c        |  12 ++-
>  3 files changed, 81 insertions(+), 77 deletions(-)
> 

Greg,

Please disregard this patchset - Jeffrey was not aware of your previous
email and sent this before I was able to talk to anyone.

Sorry for the trouble.

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 10/10] staging: unisys: parser.c logical continuation
  2014-12-01 12:39 [PATCH 00/10] parser patches v2 Jeffrey Brown
@ 2014-12-01 12:39 ` Jeffrey Brown
  0 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-12-01 12:39 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed a logical continuation on line 391 by placing the '||'
operator on line 390

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 6381e59..5f6a7b2 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -387,8 +387,8 @@ parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize)
 				break;
 			}
 		} else
-		    if (pscan[i] == ',' || pscan[i] == ';'
-			|| pscan[i] == '\0') {
+		    if (pscan[i] == ',' || pscan[i] == ';' ||
+			pscan[i] == '\0') {
 			value_length = i;
 			break;
 		}
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 10/10] staging: unisys: parser.c logical continuation
  2014-11-12 16:28 [PATCH 00/10] parser.h and parser.c patches Jeffrey Brown
@ 2014-11-12 16:28 ` Jeffrey Brown
  0 siblings, 0 replies; 18+ messages in thread
From: Jeffrey Brown @ 2014-11-12 16:28 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, Jeffrey Brown

Fixed a logical continuation on line 391 by placing the '||'
operator on line 390

Signed-off-by: Jeffrey Brown <Jeffrey.Brown@unisys.com>
---
 drivers/staging/unisys/visorchipset/parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 6381e59..5f6a7b2 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -387,8 +387,8 @@ parser_param_get(struct parser_context_tag *ctx, char *nam, int namesize)
 				break;
 			}
 		} else
-		    if (pscan[i] == ',' || pscan[i] == ';'
-			|| pscan[i] == '\0') {
+		    if (pscan[i] == ',' || pscan[i] == ';' ||
+			pscan[i] == '\0') {
 			value_length = i;
 			break;
 		}
-- 
1.8.4

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-12-01 14:39 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-01 12:26 [PATCH 00/10] parser header and c file patches Jeffrey Brown
2014-12-01 12:26 ` [PATCH 01/10] staging: unisys: parser_init camel cases Jeffrey Brown
2014-12-01 12:26 ` [PATCH 1/4] staging: unisys: visorchipset proc code Jeffrey Brown
2014-12-01 12:26 ` [PATCH 02/10] staging: unisys: parser_init_byteStream camel case Jeffrey Brown
2014-12-01 12:26 ` [PATCH 2/4] staging: unisys: uisutils.h and uisutils.c proc code Jeffrey Brown
2014-12-01 12:26 ` [PATCH 03/10] staging: unisys: simpleString_get & byteStream_get camel case Jeffrey Brown
2014-12-01 12:26 ` [PATCH 3/4] staging: unisys: timskmod proc code Jeffrey Brown
2014-12-01 12:26 ` [PATCH 04/10] staging: unisys: PARSER_CONTEXT typedef Jeffrey Brown
2014-12-01 12:26 ` [PATCH 4/4] staging: unisys: uislib.c proc code Jeffrey Brown
2014-12-01 12:26 ` [PATCH 05/10] staging: unisys: PARSER_WHICH_STRING typedef Jeffrey Brown
2014-12-01 12:26 ` [PATCH 06/10] staging: unisys: Controlvm_Payload_Bytes_Buffered camel case Jeffrey Brown
2014-12-01 12:26 ` [PATCH 07/10] staging: unisys: parser_init_guts and parser_param_start " Jeffrey Brown
2014-12-01 12:26 ` [PATCH 08/10] staging: unisys: parser.c space after casts Jeffrey Brown
2014-12-01 12:26 ` [PATCH 09/10] staging: unisys: parser.c braces Jeffrey Brown
2014-12-01 12:26 ` [PATCH 10/10] staging: unisys: parser.c logical continuation Jeffrey Brown
2014-12-01 14:38 ` [PATCH 00/10] parser header and c file patches Romer, Benjamin M
  -- strict thread matches above, loose matches on Subject: below --
2014-12-01 12:39 [PATCH 00/10] parser patches v2 Jeffrey Brown
2014-12-01 12:39 ` [PATCH 10/10] staging: unisys: parser.c logical continuation Jeffrey Brown
2014-11-12 16:28 [PATCH 00/10] parser.h and parser.c patches Jeffrey Brown
2014-11-12 16:28 ` [PATCH 10/10] staging: unisys: parser.c logical continuation Jeffrey Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.