Commit 928b4d8c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

proc: remove proc_root_driver 



Use creation by full path: "driver/foo".

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36a5aeb8

drivers/block/cciss.c

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void __devinit cciss_procinit(int i) 
	struct proc_dir_entry *pde;



	if (proc_cciss == NULL)

		proc_cciss = proc_mkdir("cciss", proc_root_driver);

		proc_cciss = proc_mkdir("driver/cciss", NULL);

	if (!proc_cciss)

		return;

	pde = proc_create(hba[i]->devname, S_IWUSR | S_IRUSR | S_IRGRP |
@@ -3700,7 +3700,7 @@ static void __exit cciss_cleanup(void) 
			cciss_remove_one(hba[i]->pdev);

		}

	}

	remove_proc_entry("cciss", proc_root_driver);

	remove_proc_entry("driver/cciss", NULL);

}



static void fail_all_cmds(unsigned long ctlr)

drivers/block/cpqarray.c

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static struct proc_dir_entry *proc_array; 
static void __init ida_procinit(int i)

{

	if (proc_array == NULL) {

		proc_array = proc_mkdir("cpqarray", proc_root_driver);

		proc_array = proc_mkdir("driver/cpqarray", NULL);

		if (!proc_array) return;

	}
@@ -1796,7 +1796,7 @@ static void __exit cpqarray_exit(void) 
		}

	}



	remove_proc_entry("cpqarray", proc_root_driver);

	remove_proc_entry("driver/cpqarray", NULL);

}



module_init(cpqarray_init)

drivers/block/pktcdvd.c

+2 −2
Original line number Diff line number Diff line
@@ -3101,7 +3101,7 @@ static int __init pkt_init(void) 
		goto out_misc;

	}



	pkt_proc = proc_mkdir(DRIVER_NAME, proc_root_driver);

	pkt_proc = proc_mkdir("driver/"DRIVER_NAME, NULL);



	return 0;
@@ -3117,7 +3117,7 @@ static int __init pkt_init(void) 


static void __exit pkt_exit(void)

{

	remove_proc_entry(DRIVER_NAME, proc_root_driver);

	remove_proc_entry("driver/"DRIVER_NAME, NULL);

	misc_deregister(&pkt_misc);



	pkt_debugfs_cleanup();

drivers/net/wireless/airo.c

+4 −4
Original line number Diff line number Diff line
@@ -5625,9 +5625,9 @@ static int __init airo_init_module( void ) 
	int have_isa_dev = 0;

#endif



	airo_entry = create_proc_entry("aironet",

	airo_entry = create_proc_entry("driver/aironet",

				       S_IFDIR | airo_perm,

				       proc_root_driver);

				       NULL);



	if (airo_entry) {

		airo_entry->uid = proc_uid;
@@ -5651,7 +5651,7 @@ static int __init airo_init_module( void ) 
	airo_print_info("", "Finished probing for PCI adapters");



	if (i) {

		remove_proc_entry("aironet", proc_root_driver);

		remove_proc_entry("driver/aironet", NULL);

		return i;

	}

#endif
@@ -5673,7 +5673,7 @@ static void __exit airo_cleanup_module( void ) 
#ifdef CONFIG_PCI

	pci_unregister_driver(&airo_driver);

#endif

	remove_proc_entry("aironet", proc_root_driver);

	remove_proc_entry("driver/aironet", NULL);

}



/*

fs/proc/root.c

+1 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


#include "internal.h"



struct proc_dir_entry *proc_root_driver;



static int proc_test_super(struct super_block *sb, void *data)

{

	return sb->s_fs_info == data;
@@ -127,7 +125,7 @@ void __init proc_root_init(void) 
	proc_mkdir("sysvipc", NULL);

#endif

	proc_mkdir("fs", NULL);

	proc_root_driver = proc_mkdir("driver", NULL);

	proc_mkdir("driver", NULL);

	proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */

#if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE)

	/* just give it a mountpoint */
@@ -235,4 +233,3 @@ EXPORT_SYMBOL(create_proc_entry); 
EXPORT_SYMBOL(proc_create);

EXPORT_SYMBOL(remove_proc_entry);

EXPORT_SYMBOL(proc_root);
 
EXPORT_SYMBOL(proc_root_driver);