From: David Howells <dhowells@redhat.com>
Date: Thu, 4 Apr 2013 15:49:26 +0000 (+0100)
Subject: wlags49_h2: Don't use create_proc_entry()
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~12630^2~91
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3cba53765bdaeef0a5ee8680b0dd4b028f3cae79;p=mirror_ubuntu-artful-kernel.git

wlags49_h2: Don't use create_proc_entry()

create_proc_entry() shouldn't be used.  Rather proc_create_data() should be
used.  The proc_write() function is only used by #if'd out code, so delete it
for now.

Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index f5f120a62460..174c41af4847 100644
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -147,7 +147,6 @@ void wl_isr_handler( unsigned long p );
 //int scull_read_procmem(char *buf, char **start, off_t offset, int len, int unused);
 int scull_read_procmem(char *buf, char **start, off_t offset, int len, int *eof, void *data );
 static int write_int(struct file *file, const char *buffer, unsigned long count, void *data);
-static void proc_write(const char *name, write_proc_t *w, void *data);
 
 #endif /* SCULL_USE_PROC */
 
@@ -910,7 +909,6 @@ int wl_insert( struct net_device *dev )
 #if 0 //SCULL_USE_PROC /* don't waste space if unused */
 	create_proc_read_entry( "wlags", 0, NULL, scull_read_procmem, dev );
 	proc_mkdir("driver/wlags49", 0);
-	proc_write("driver/wlags49/wlags49_type", write_int, &lp->wlags49_type);
 #endif /* SCULL_USE_PROC */
 
 	DBG_LEAVE( DbgInfo );
@@ -3773,15 +3771,6 @@ int scull_read_procmem(char *buf, char **start, off_t offset, int len, int *eof,
     return len;
 } // scull_read_procmem
 
-static void proc_write(const char *name, write_proc_t *w, void *data)
-{
-	struct proc_dir_entry * entry = create_proc_entry(name, S_IFREG | S_IWUSR, NULL);
-	if (entry) {
-		entry->write_proc = w;
-		entry->data = data;
-	}
-} // proc_write
-
 static int write_int(struct file *file, const char *buffer, unsigned long count, void *data)
 {
 	static char		proc_number[11];