Commit 9c37066d authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

proc: remove proc_bus 



Remove proc_bus export and variable itself. Using pathnames works fine
and is slightly more understandable and greppable.

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 5e971dce

arch/arm/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static struct proc_dir_entry *proc_bus_ecard_dir = NULL; 


static void ecard_proc_init(void)

{

	proc_bus_ecard_dir = proc_mkdir("ecard", proc_bus);

	proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);

	create_proc_info_entry("devices", 0, proc_bus_ecard_dir,

		get_ecard_dev_info);

}

drivers/input/input.c

+3 −3
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static int __init input_proc_init(void) 
{

	struct proc_dir_entry *entry;



	proc_bus_input_dir = proc_mkdir("input", proc_bus);

	proc_bus_input_dir = proc_mkdir("bus/input", NULL);

	if (!proc_bus_input_dir)

		return -ENOMEM;
@@ -921,7 +921,7 @@ static int __init input_proc_init(void) 
	return 0;



 fail2:	remove_proc_entry("devices", proc_bus_input_dir);

 fail1: remove_proc_entry("input", proc_bus);

 fail1: remove_proc_entry("bus/input", NULL);

	return -ENOMEM;

}
@@ -929,7 +929,7 @@ static void input_proc_exit(void) 
{

	remove_proc_entry("devices", proc_bus_input_dir);

	remove_proc_entry("handlers", proc_bus_input_dir);

	remove_proc_entry("input", proc_bus);

	remove_proc_entry("bus/input", NULL);

}



#else /* !CONFIG_PROC_FS */

drivers/nubus/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void __init nubus_proc_init(void) 
{

	if (!MACH_IS_MAC)

		return;

	proc_bus_nubus_dir = proc_mkdir("nubus", proc_bus);

	proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);

	create_proc_info_entry("devices", 0, proc_bus_nubus_dir,

				get_nubus_dev_info);

	proc_bus_nubus_add_devices();

drivers/pci/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int __init pci_proc_init(void) 
{

	struct proc_dir_entry *entry;

	struct pci_dev *dev = NULL;

	proc_bus_pci_dir = proc_mkdir("pci", proc_bus);

	proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);

	entry = create_proc_entry("devices", 0, proc_bus_pci_dir);

	if (entry)

		entry->proc_fops = &proc_bus_pci_dev_operations;

drivers/pnp/isapnp/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int __init isapnp_proc_init(void) 
{

	struct pnp_dev *dev;



	isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus);

	isapnp_proc_bus_dir = proc_mkdir("bus/isapnp", NULL);

	protocol_for_each_dev(&isapnp_protocol, dev) {

		isapnp_proc_attach_device(dev);

	}