mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
proc: remove proc_root from drivers
Remove proc_root export. Creation and removal works well if parent PDE is supplied as NULL -- it worked always that way. So, one useless export removed and consistency added, some drivers created PDEs with &proc_root as parent but removed them as NULL and so on. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
928b4d8c89
commit
c74c120a21
22 changed files with 34 additions and 38 deletions
|
|
@ -311,7 +311,7 @@ out_error:
|
|||
int
|
||||
dasd_proc_init(void)
|
||||
{
|
||||
dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
|
||||
dasd_proc_root_entry = proc_mkdir("dasd", NULL);
|
||||
if (!dasd_proc_root_entry)
|
||||
goto out_nodasd;
|
||||
dasd_proc_root_entry->owner = THIS_MODULE;
|
||||
|
|
@ -335,7 +335,7 @@ dasd_proc_init(void)
|
|||
out_nostatistics:
|
||||
remove_proc_entry("devices", dasd_proc_root_entry);
|
||||
out_nodevices:
|
||||
remove_proc_entry("dasd", &proc_root);
|
||||
remove_proc_entry("dasd", NULL);
|
||||
out_nodasd:
|
||||
return -ENOENT;
|
||||
}
|
||||
|
|
@ -345,5 +345,5 @@ dasd_proc_exit(void)
|
|||
{
|
||||
remove_proc_entry("devices", dasd_proc_root_entry);
|
||||
remove_proc_entry("statistics", dasd_proc_root_entry);
|
||||
remove_proc_entry("dasd", &proc_root);
|
||||
remove_proc_entry("dasd", NULL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ tape_proc_init(void)
|
|||
{
|
||||
tape_proc_devices =
|
||||
create_proc_entry ("tapedevices", S_IFREG | S_IRUGO | S_IWUSR,
|
||||
&proc_root);
|
||||
NULL);
|
||||
if (tape_proc_devices == NULL) {
|
||||
PRINT_WARN("tape: Cannot register procfs entry tapedevices\n");
|
||||
return;
|
||||
|
|
@ -141,5 +141,5 @@ void
|
|||
tape_proc_cleanup(void)
|
||||
{
|
||||
if (tape_proc_devices != NULL)
|
||||
remove_proc_entry ("tapedevices", &proc_root);
|
||||
remove_proc_entry ("tapedevices", NULL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ cio_ignore_proc_init (void)
|
|||
struct proc_dir_entry *entry;
|
||||
|
||||
entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
|
||||
&proc_root);
|
||||
NULL);
|
||||
if (!entry)
|
||||
return -ENOENT;
|
||||
|
||||
|
|
|
|||
|
|
@ -3632,7 +3632,7 @@ qdio_add_procfs_entry(void)
|
|||
{
|
||||
proc_perf_file_registration=0;
|
||||
qdio_perf_proc_file=create_proc_entry(QDIO_PERF,
|
||||
S_IFREG|0444,&proc_root);
|
||||
S_IFREG|0444,NULL);
|
||||
if (qdio_perf_proc_file) {
|
||||
qdio_perf_proc_file->read_proc=&qdio_perf_procfile_read;
|
||||
} else proc_perf_file_registration=-1;
|
||||
|
|
@ -3647,7 +3647,7 @@ static void
|
|||
qdio_remove_procfs_entry(void)
|
||||
{
|
||||
if (!proc_perf_file_registration) /* means if it went ok earlier */
|
||||
remove_proc_entry(QDIO_PERF,&proc_root);
|
||||
remove_proc_entry(QDIO_PERF,NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue