[PATCH 4/4] staging: unisys: uislib.c proc code

[Jeffrey Brown <Jeffrey.Brown@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel