aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-04-29 04:01:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:18 -0400
commit928b4d8c8963e75bdb133f562b03b07f9aa4844a (patch)
tree18de7e85fe403f681a954ed04254b2d9085e7fe4 /drivers/block
parent36a5aeb8787fbf92510ed20d806e229c55726f93 (diff)
proc: remove proc_root_driver
Use creation by full path: "driver/foo". Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c4
-rw-r--r--drivers/block/cpqarray.c4
-rw-r--r--drivers/block/pktcdvd.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index cf6083a1f928..e539be5750dc 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -425,7 +425,7 @@ static void __devinit cciss_procinit(int i)
425 struct proc_dir_entry *pde; 425 struct proc_dir_entry *pde;
426 426
427 if (proc_cciss == NULL) 427 if (proc_cciss == NULL)
428 proc_cciss = proc_mkdir("cciss", proc_root_driver); 428 proc_cciss = proc_mkdir("driver/cciss", NULL);
429 if (!proc_cciss) 429 if (!proc_cciss)
430 return; 430 return;
431 pde = proc_create(hba[i]->devname, S_IWUSR | S_IRUSR | S_IRGRP | 431 pde = proc_create(hba[i]->devname, S_IWUSR | S_IRUSR | S_IRGRP |
@@ -3700,7 +3700,7 @@ static void __exit cciss_cleanup(void)
3700 cciss_remove_one(hba[i]->pdev); 3700 cciss_remove_one(hba[i]->pdev);
3701 } 3701 }
3702 } 3702 }
3703 remove_proc_entry("cciss", proc_root_driver); 3703 remove_proc_entry("driver/cciss", NULL);
3704} 3704}
3705 3705
3706static void fail_all_cmds(unsigned long ctlr) 3706static void fail_all_cmds(unsigned long ctlr)
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 69199185ff4b..09c14341e6e3 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -214,7 +214,7 @@ static struct proc_dir_entry *proc_array;
214static void __init ida_procinit(int i) 214static void __init ida_procinit(int i)
215{ 215{
216 if (proc_array == NULL) { 216 if (proc_array == NULL) {
217 proc_array = proc_mkdir("cpqarray", proc_root_driver); 217 proc_array = proc_mkdir("driver/cpqarray", NULL);
218 if (!proc_array) return; 218 if (!proc_array) return;
219 } 219 }
220 220
@@ -1796,7 +1796,7 @@ static void __exit cpqarray_exit(void)
1796 } 1796 }
1797 } 1797 }
1798 1798
1799 remove_proc_entry("cpqarray", proc_root_driver); 1799 remove_proc_entry("driver/cpqarray", NULL);
1800} 1800}
1801 1801
1802module_init(cpqarray_init) 1802module_init(cpqarray_init)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 18feb1c7c33b..0431e5977bcb 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -3101,7 +3101,7 @@ static int __init pkt_init(void)
3101 goto out_misc; 3101 goto out_misc;
3102 } 3102 }
3103 3103
3104 pkt_proc = proc_mkdir(DRIVER_NAME, proc_root_driver); 3104 pkt_proc = proc_mkdir("driver/"DRIVER_NAME, NULL);
3105 3105
3106 return 0; 3106 return 0;
3107 3107
@@ -3117,7 +3117,7 @@ out2:
3117 3117
3118static void __exit pkt_exit(void) 3118static void __exit pkt_exit(void)
3119{ 3119{
3120 remove_proc_entry(DRIVER_NAME, proc_root_driver); 3120 remove_proc_entry("driver/"DRIVER_NAME, NULL);
3121 misc_deregister(&pkt_misc); 3121 misc_deregister(&pkt_misc);
3122 3122
3123 pkt_debugfs_cleanup(); 3123 pkt_debugfs_cleanup();