Commit cdefa185 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Linus Torvalds

usb: use non-racy method for proc entries creation

Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a973909f
...@@ -231,6 +231,7 @@ static int proc_udc_open(struct inode *inode, struct file *file) ...@@ -231,6 +231,7 @@ static int proc_udc_open(struct inode *inode, struct file *file)
} }
static const struct file_operations proc_ops = { static const struct file_operations proc_ops = {
.owner = THIS_MODULE,
.open = proc_udc_open, .open = proc_udc_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
...@@ -239,15 +240,7 @@ static const struct file_operations proc_ops = { ...@@ -239,15 +240,7 @@ static const struct file_operations proc_ops = {
static void create_debug_file(struct at91_udc *udc) static void create_debug_file(struct at91_udc *udc)
{ {
struct proc_dir_entry *pde; udc->pde = proc_create_data(debug_filename, 0, NULL, &proc_ops, udc);
pde = create_proc_entry (debug_filename, 0, NULL);
udc->pde = pde;
if (pde == NULL)
return;
pde->proc_fops = &proc_ops;
pde->data = udc;
} }
static void remove_debug_file(struct at91_udc *udc) static void remove_debug_file(struct at91_udc *udc)
......
...@@ -2504,6 +2504,7 @@ static int proc_udc_open(struct inode *inode, struct file *file) ...@@ -2504,6 +2504,7 @@ static int proc_udc_open(struct inode *inode, struct file *file)
} }
static const struct file_operations proc_ops = { static const struct file_operations proc_ops = {
.owner = THIS_MODULE,
.open = proc_udc_open, .open = proc_udc_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
...@@ -2512,11 +2513,7 @@ static const struct file_operations proc_ops = { ...@@ -2512,11 +2513,7 @@ static const struct file_operations proc_ops = {
static void create_proc_file(void) static void create_proc_file(void)
{ {
struct proc_dir_entry *pde; proc_create(proc_filename, 0, NULL, &proc_ops);
pde = create_proc_entry (proc_filename, 0, NULL);
if (pde)
pde->proc_fops = &proc_ops;
} }
static void remove_proc_file(void) static void remove_proc_file(void)
......
...@@ -1506,15 +1506,7 @@ static const char proc_filename[] = "driver/sl811h"; ...@@ -1506,15 +1506,7 @@ static const char proc_filename[] = "driver/sl811h";
static void create_debug_file(struct sl811 *sl811) static void create_debug_file(struct sl811 *sl811)
{ {
struct proc_dir_entry *pde; sl811->pde = proc_create_data(proc_filename, 0, NULL, &proc_ops, sl811);
pde = create_proc_entry(proc_filename, 0, NULL);
if (pde == NULL)
return;
pde->proc_fops = &proc_ops;
pde->data = sl811;
sl811->pde = pde;
} }
static void remove_debug_file(struct sl811 *sl811) static void remove_debug_file(struct sl811 *sl811)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment