AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

USB: rndis: switch to seq_files

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alexey Dobriyan 2008-05-14 16:25:13 -07:00 committed by Greg Kroah-Hartman
parent baad4119a3
commit e184d5fcaa
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/usb/gadget/rndis.c
View File

@ -28,6 +28,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <asm/io.h> #include <asm/io.h>
@ -1294,14 +1295,11 @@ int rndis_rm_hdr(struct sk_buff *skb)
#ifdef CONFIG_USB_GADGET_DEBUG_FILES #ifdef CONFIG_USB_GADGET_DEBUG_FILES
static int rndis_proc_read (char *page, char **start, off_t off, int count, int *eof, static int rndis_proc_show(struct seq_file *m, void *v)
void *data)
{ {
char *out = page; rndis_params *param = m->private;
int len;
rndis_params *param = (rndis_params *) data;
out += snprintf (out, count, seq_printf(m,
"Config Nr. %d\n" "Config Nr. %d\n"
"used : %s\n" "used : %s\n"
"state : %s\n" "state : %s\n"
@ -1324,25 +1322,13 @@ static int rndis_proc_read (char *page, char **start, off_t off, int count, int
(param->media_state) ? 0 : param->speed*100, (param->media_state) ? 0 : param->speed*100,
(param->media_state) ? "disconnected" : "connected", (param->media_state) ? "disconnected" : "connected",
param->vendorID, param->vendorDescr); param->vendorID, param->vendorDescr);
return 0;
len = out - page;
len -= off;
if (len < count) {
*eof = 1;
if (len <= 0)
return 0;
} else
len = count;
*start = page + off;
return len;
} }
static int rndis_proc_write (struct file *file, const char __user *buffer, static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) size_t count, loff_t *ppos)
{ {
rndis_params *p = data; rndis_params *p = PDE(file->f_path.dentry->d_inode)->data;
u32 speed = 0; u32 speed = 0;
int i, fl_speed = 0; int i, fl_speed = 0;
@ -1384,6 +1370,20 @@ static int rndis_proc_write (struct file *file, const char __user *buffer,
return count; return count;
} }
static int rndis_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, rndis_proc_show, PDE(inode)->data);
}
static const struct file_operations rndis_proc_fops = {
.owner = THIS_MODULE,
.open = rndis_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
.write = rndis_proc_write,
};
#define NAME_TEMPLATE "driver/rndis-%03d" #define NAME_TEMPLATE "driver/rndis-%03d"
static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS]; static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS];
@ -1401,7 +1401,9 @@ int __init rndis_init (void)
sprintf (name, NAME_TEMPLATE, i); sprintf (name, NAME_TEMPLATE, i);
if (!(rndis_connect_state [i] if (!(rndis_connect_state [i]
= create_proc_entry (name, 0660, NULL))) = proc_create_data(name, 0660, NULL,
&rndis_proc_fops,
(void *)(rndis_per_dev_params + i))))
{ {
DBG("%s :remove entries", __func__); DBG("%s :remove entries", __func__);
while (i) { while (i) {
@ -1411,11 +1413,6 @@ int __init rndis_init (void)
DBG("\n"); DBG("\n");
return -EIO; return -EIO;
} }
rndis_connect_state [i]->write_proc = rndis_proc_write;
rndis_connect_state [i]->read_proc = rndis_proc_read;
rndis_connect_state [i]->data = (void *)
(rndis_per_dev_params + i);
#endif #endif
rndis_per_dev_params [i].confignr = i; rndis_per_dev_params [i].confignr = i;
rndis_per_dev_params [i].used = 0; rndis_per_dev_params [i].used = 0;