diff options
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index cf6083a1f928..e336b05fe4a7 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -425,16 +425,12 @@ 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_data(hba[i]->devname, S_IWUSR | S_IRUSR | S_IRGRP | |
432 | S_IROTH, proc_cciss, | 432 | S_IROTH, proc_cciss, |
433 | &cciss_proc_fops); | 433 | &cciss_proc_fops, hba[i]); |
434 | if (!pde) | ||
435 | return; | ||
436 | |||
437 | pde->data = hba[i]; | ||
438 | } | 434 | } |
439 | #endif /* CONFIG_PROC_FS */ | 435 | #endif /* CONFIG_PROC_FS */ |
440 | 436 | ||
@@ -3700,7 +3696,7 @@ static void __exit cciss_cleanup(void) | |||
3700 | cciss_remove_one(hba[i]->pdev); | 3696 | cciss_remove_one(hba[i]->pdev); |
3701 | } | 3697 | } |
3702 | } | 3698 | } |
3703 | remove_proc_entry("cciss", proc_root_driver); | 3699 | remove_proc_entry("driver/cciss", NULL); |
3704 | } | 3700 | } |
3705 | 3701 | ||
3706 | static void fail_all_cmds(unsigned long ctlr) | 3702 | static void fail_all_cmds(unsigned long ctlr) |