Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / dgrp / dgrp_specproc.c

diff --git a/drivers/staging/dgrp/dgrp_specproc.c b/drivers/staging/dgrp/dgrp_specproc.c
index c214078a89e91a650fac11e763c7746bb09e8ba7..73f287f966046b7f89ff5e4a6c3038f9c98d6d52 100644 (file)
--- a/drivers/staging/dgrp/dgrp_specproc.c
+++ b/drivers/staging/dgrp/dgrp_specproc.c
@@ -81,33 +81,34 @@ static struct dgrp_proc_entry dgrp_mon_table[];
 static struct dgrp_proc_entry dgrp_ports_table[];
 static struct dgrp_proc_entry dgrp_dpa_table[];
 
-static ssize_t config_proc_write(struct file *file, const char __user *buffer,
-                                size_t count, loff_t *pos);
+static ssize_t dgrp_config_proc_write(struct file *file,
+                                     const char __user *buffer,
+                                     size_t count, loff_t *pos);
 
-static int nodeinfo_proc_open(struct inode *inode, struct file *file);
-static int info_proc_open(struct inode *inode, struct file *file);
-static int config_proc_open(struct inode *inode, struct file *file);
+static int dgrp_nodeinfo_proc_open(struct inode *inode, struct file *file);
+static int dgrp_info_proc_open(struct inode *inode, struct file *file);
+static int dgrp_config_proc_open(struct inode *inode, struct file *file);
 
 static struct file_operations config_proc_file_ops = {
        .owner   = THIS_MODULE,
-       .open    = config_proc_open,
+       .open    = dgrp_config_proc_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .release = seq_release,
-       .write   = config_proc_write
+       .write   = dgrp_config_proc_write,
 };
 
 static struct file_operations info_proc_file_ops = {
        .owner   = THIS_MODULE,
-       .open    = info_proc_open,
+       .open    = dgrp_info_proc_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release,
+       .release = single_release,
 };
 
 static struct file_operations nodeinfo_proc_file_ops = {
        .owner   = THIS_MODULE,
-       .open    = nodeinfo_proc_open,
+       .open    = dgrp_nodeinfo_proc_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .release = seq_release,
@@ -181,13 +182,13 @@ static struct dgrp_proc_entry dgrp_dpa_table[] = {
 
 void dgrp_unregister_proc(void)
 {
-       unregister_proc_table(dgrp_table, dgrp_proc_dir_entry);
        net_entry_pointer = NULL;
        mon_entry_pointer = NULL;
        dpa_entry_pointer = NULL;
        ports_entry_pointer = NULL;
 
        if (dgrp_proc_dir_entry) {
+               unregister_proc_table(dgrp_table, dgrp_proc_dir_entry);
                remove_proc_entry(dgrp_proc_dir_entry->name,
                                  dgrp_proc_dir_entry->parent);
                dgrp_proc_dir_entry = NULL;
@@ -231,6 +232,8 @@ static void register_proc_table(struct dgrp_proc_entry *table,
 
        if (table == NULL)
                return;
+       if (root == NULL)
+               return;
 
        for (; table->id; table++) {
                /* Can't do anything without a proc name. */
@@ -354,7 +357,7 @@ static int dgrp_gen_proc_open(struct inode *inode, struct file *file)
        struct dgrp_proc_entry *entry;
        int ret = 0;
 
-       de = (struct proc_dir_entry *) PDE(file->f_dentry->d_inode);
+       de = (struct proc_dir_entry *) PDE(file_inode(file));
        if (!de || !de->data) {
                ret = -ENXIO;
                goto done;
@@ -384,7 +387,7 @@ static int dgrp_gen_proc_close(struct inode *inode, struct file *file)
        struct proc_dir_entry *de;
        struct dgrp_proc_entry *entry;
 
-       de = (struct proc_dir_entry *) PDE(file->f_dentry->d_inode);
+       de = (struct proc_dir_entry *) PDE(file_inode(file));
        if (!de || !de->data)
                goto done;
 
@@ -403,21 +406,21 @@ done:
        return 0;
 }
 
-static void *config_proc_start(struct seq_file *m, loff_t *pos)
+static void *dgrp_config_proc_start(struct seq_file *m, loff_t *pos)
 {
        return seq_list_start_head(&nd_struct_list, *pos);
 }
 
-static void *config_proc_next(struct seq_file *p, void *v, loff_t *pos)
+static void *dgrp_config_proc_next(struct seq_file *p, void *v, loff_t *pos)
 {
        return seq_list_next(v, &nd_struct_list, pos);
 }
 
-static void config_proc_stop(struct seq_file *m, void *v)
+static void dgrp_config_proc_stop(struct seq_file *m, void *v)
 {
 }
 
-static int config_proc_show(struct seq_file *m, void *v)
+static int dgrp_config_proc_show(struct seq_file *m, void *v)
 {
        struct nd_struct *nd;
        char tmp_id[4];
@@ -443,13 +446,13 @@ static int config_proc_show(struct seq_file *m, void *v)
 }
 
 static const struct seq_operations proc_config_ops = {
-       .start = config_proc_start,
-       .next  = config_proc_next,
-       .stop  = config_proc_stop,
-       .show  = config_proc_show
+       .start = dgrp_config_proc_start,
+       .next  = dgrp_config_proc_next,
+       .stop  = dgrp_config_proc_stop,
+       .show  = dgrp_config_proc_show,
 };
 
-static int config_proc_open(struct inode *inode, struct file *file)
+static int dgrp_config_proc_open(struct inode *inode, struct file *file)
 {
        return seq_open(file, &proc_config_ops);
 }
@@ -460,8 +463,9 @@ static int config_proc_open(struct inode *inode, struct file *file)
  *  write) is treated as an independent request.  See the "parse"
  *  description for more details.
  */
-static ssize_t config_proc_write(struct file *file, const char __user *buffer,
-                                size_t count, loff_t *pos)
+static ssize_t dgrp_config_proc_write(struct file *file,
+                                     const char __user *buffer,
+                                     size_t count, loff_t *pos)
 {
        ssize_t retval;
        char *inbuf, *sp;
@@ -625,7 +629,7 @@ static int parse_write_config(char *buf)
        return retval;
 }
 
-static int info_proc_show(struct seq_file *m, void *v)
+static int dgrp_info_proc_show(struct seq_file *m, void *v)
 {
        seq_printf(m, "version: %s\n", DIGI_VERSION);
        seq_puts(m, "register_with_sysfs: 1\n");
@@ -635,27 +639,27 @@ static int info_proc_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static int info_proc_open(struct inode *inode, struct file *file)
+static int dgrp_info_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, info_proc_show, NULL);
+       return single_open(file, dgrp_info_proc_show, NULL);
 }
 
 
-static void *nodeinfo_start(struct seq_file *m, loff_t *pos)
+static void *dgrp_nodeinfo_start(struct seq_file *m, loff_t *pos)
 {
        return seq_list_start_head(&nd_struct_list, *pos);
 }
 
-static void *nodeinfo_next(struct seq_file *p, void *v, loff_t *pos)
+static void *dgrp_nodeinfo_next(struct seq_file *p, void *v, loff_t *pos)
 {
        return seq_list_next(v, &nd_struct_list, pos);
 }
 
-static void nodeinfo_stop(struct seq_file *m, void *v)
+static void dgrp_nodeinfo_stop(struct seq_file *m, void *v)
 {
 }
 
-static int nodeinfo_show(struct seq_file *m, void *v)
+static int dgrp_nodeinfo_show(struct seq_file *m, void *v)
 {
        struct nd_struct *nd;
        char hwver[8];
@@ -697,13 +701,13 @@ static int nodeinfo_show(struct seq_file *m, void *v)
 
 
 static const struct seq_operations nodeinfo_ops = {
-       .start = nodeinfo_start,
-       .next  = nodeinfo_next,
-       .stop  = nodeinfo_stop,
-       .show  = nodeinfo_show
+       .start = dgrp_nodeinfo_start,
+       .next  = dgrp_nodeinfo_next,
+       .stop  = dgrp_nodeinfo_stop,
+       .show  = dgrp_nodeinfo_show,
 };
 
-static int nodeinfo_proc_open(struct inode *inode, struct file *file)
+static int dgrp_nodeinfo_proc_open(struct inode *inode, struct file *file)
 {
        return seq_open(file, &nodeinfo_ops);
 }
@@ -773,14 +777,11 @@ static int dgrp_remove_nd(struct nd_struct *nd)
                dgrp_remove_node_class_sysfs_files(nd);
        }
 
-       if (nd->nd_mon_de)
-               unregister_dgrp_device(nd->nd_mon_de);
+       unregister_dgrp_device(nd->nd_mon_de);
 
-       if (nd->nd_ports_de)
-               unregister_dgrp_device(nd->nd_ports_de);
+       unregister_dgrp_device(nd->nd_ports_de);
 
-       if (nd->nd_dpa_de)
-               unregister_dgrp_device(nd->nd_dpa_de);
+       unregister_dgrp_device(nd->nd_dpa_de);
 
        dgrp_tty_uninit(nd);