Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 9c37066d888bf6e1b96ad12304971b3ddeabbad0

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent 5e971dce0b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 10 changed files with 14 additions and 17 deletions Side-by-side Diff

arch/arm/kernel/ecard.c
Diff comments   View file @ 9c37066
... ... @@ -778,7 +778,7 @@
778 778  
779 779 static void ecard_proc_init(void)
780 780 {
781   - proc_bus_ecard_dir = proc_mkdir("ecard", proc_bus);
  781 + proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);
782 782 create_proc_info_entry("devices", 0, proc_bus_ecard_dir,
783 783 get_ecard_dev_info);
784 784 }
drivers/input/input.c
Diff comments   View file @ 9c37066
... ... @@ -898,7 +898,7 @@
898 898 {
899 899 struct proc_dir_entry *entry;
900 900  
901   - proc_bus_input_dir = proc_mkdir("input", proc_bus);
  901 + proc_bus_input_dir = proc_mkdir("bus/input", NULL);
902 902 if (!proc_bus_input_dir)
903 903 return -ENOMEM;
904 904  
... ... @@ -921,7 +921,7 @@
921 921 return 0;
922 922  
923 923 fail2: remove_proc_entry("devices", proc_bus_input_dir);
924   - fail1: remove_proc_entry("input", proc_bus);
  924 + fail1: remove_proc_entry("bus/input", NULL);
925 925 return -ENOMEM;
926 926 }
927 927  
... ... @@ -929,7 +929,7 @@
929 929 {
930 930 remove_proc_entry("devices", proc_bus_input_dir);
931 931 remove_proc_entry("handlers", proc_bus_input_dir);
932   - remove_proc_entry("input", proc_bus);
  932 + remove_proc_entry("bus/input", NULL);
933 933 }
934 934  
935 935 #else /* !CONFIG_PROC_FS */
drivers/nubus/proc.c
Diff comments   View file @ 9c37066
... ... @@ -171,7 +171,7 @@
171 171 {
172 172 if (!MACH_IS_MAC)
173 173 return;
174   - proc_bus_nubus_dir = proc_mkdir("nubus", proc_bus);
  174 + proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
175 175 create_proc_info_entry("devices", 0, proc_bus_nubus_dir,
176 176 get_nubus_dev_info);
177 177 proc_bus_nubus_add_devices();
... ... @@ -472,7 +472,7 @@
472 472 {
473 473 struct proc_dir_entry *entry;
474 474 struct pci_dev *dev = NULL;
475   - proc_bus_pci_dir = proc_mkdir("pci", proc_bus);
  475 + proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
476 476 entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
477 477 if (entry)
478 478 entry->proc_fops = &proc_bus_pci_dev_operations;
drivers/pnp/isapnp/proc.c
Diff comments   View file @ 9c37066
... ... @@ -116,7 +116,7 @@
116 116 {
117 117 struct pnp_dev *dev;
118 118  
119   - isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus);
  119 + isapnp_proc_bus_dir = proc_mkdir("bus/isapnp", NULL);
120 120 protocol_for_each_dev(&isapnp_protocol, dev) {
121 121 isapnp_proc_attach_device(dev);
122 122 }
drivers/pnp/pnpbios/proc.c
Diff comments   View file @ 9c37066
... ... @@ -256,7 +256,7 @@
256 256 */
257 257 int __init pnpbios_proc_init(void)
258 258 {
259   - proc_pnp = proc_mkdir("pnp", proc_bus);
  259 + proc_pnp = proc_mkdir("bus/pnp", NULL);
260 260 if (!proc_pnp)
261 261 return -EIO;
262 262 proc_pnp_boot = proc_mkdir("boot", proc_pnp);
... ... @@ -294,6 +294,6 @@
294 294 remove_proc_entry("configuration_info", proc_pnp);
295 295 remove_proc_entry("devices", proc_pnp);
296 296 remove_proc_entry("boot", proc_pnp);
297   - remove_proc_entry("pnp", proc_bus);
  297 + remove_proc_entry("bus/pnp", NULL);
298 298 }
drivers/usb/core/inode.c
Diff comments   View file @ 9c37066
... ... @@ -773,7 +773,7 @@
773 773 usb_register_notify(&usbfs_nb);
774 774  
775 775 /* create mount point for usbfs */
776   - usbdir = proc_mkdir("usb", proc_bus);
  776 + usbdir = proc_mkdir("bus/usb", NULL);
777 777  
778 778 return 0;
779 779 }
... ... @@ -783,6 +783,6 @@
783 783 usb_unregister_notify(&usbfs_nb);
784 784 unregister_filesystem(&usb_fs_type);
785 785 if (usbdir)
786   - remove_proc_entry("usb", proc_bus);
  786 + remove_proc_entry("bus/usb", NULL);
787 787 }
drivers/zorro/proc.c
Diff comments   View file @ 9c37066
... ... @@ -128,7 +128,7 @@
128 128 u_int slot;
129 129  
130 130 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) {
131   - proc_bus_zorro_dir = proc_mkdir("zorro", proc_bus);
  131 + proc_bus_zorro_dir = proc_mkdir("bus/zorro", NULL);
132 132 create_proc_info_entry("devices", 0, proc_bus_zorro_dir,
133 133 get_zorro_dev_info);
134 134 for (slot = 0; slot < zorro_num_autocon; slot++)
... ... @@ -22,7 +22,7 @@
22 22  
23 23 #include "internal.h"
24 24  
25   -struct proc_dir_entry *proc_bus, *proc_root_fs, *proc_root_driver;
  25 +struct proc_dir_entry *proc_root_fs, *proc_root_driver;
26 26  
27 27 static int proc_test_super(struct super_block *sb, void *data)
28 28 {
... ... @@ -137,7 +137,7 @@
137 137 #ifdef CONFIG_PROC_DEVICETREE
138 138 proc_device_tree_init();
139 139 #endif
140   - proc_bus = proc_mkdir("bus", NULL);
  140 + proc_mkdir("bus", NULL);
141 141 proc_sys_init();
142 142 }
143 143  
... ... @@ -236,6 +236,5 @@
236 236 EXPORT_SYMBOL(remove_proc_entry);
237 237 EXPORT_SYMBOL(proc_root);
238 238 EXPORT_SYMBOL(proc_root_fs);
239   -EXPORT_SYMBOL(proc_bus);
240 239 EXPORT_SYMBOL(proc_root_driver);
include/linux/proc_fs.h
Diff comments   View file @ 9c37066
... ... @@ -98,7 +98,6 @@
98 98  
99 99 extern struct proc_dir_entry proc_root;
100 100 extern struct proc_dir_entry *proc_root_fs;
101   -extern struct proc_dir_entry *proc_bus;
102 101 extern struct proc_dir_entry *proc_root_driver;
103 102 extern struct proc_dir_entry *proc_root_kcore;
104 103  
... ... @@ -214,7 +213,6 @@
214 213 #else
215 214  
216 215 #define proc_root_driver NULL
217   -#define proc_bus NULL
218 216  
219 217 #define proc_net_fops_create(net, name, mode, fops) ({ (void)(mode), NULL; })
220 218 static inline void proc_net_remove(struct net *net, const char *name) {}