proc: Supply a function to remove a proc entry by PDE

Supply a function (proc_remove()) to remove a proc entry (and any subtree
rooted there) by proc_dir_entry pointer rather than by name and (optionally)
root dir entry pointer.  This allows us to eliminate all remaining pde->name
accesses outside of procfs.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Grant Likely <grant.likely@linaro.or>
cc: linux-acpi@vger.kernel.org
cc: openipmi-developer@lists.sourceforge.net
cc: devicetree-discuss@lists.ozlabs.org
cc: linux-pci@vger.kernel.org
cc: netdev@vger.kernel.org
cc: netfilter-devel@vger.kernel.org
cc: alsa-devel@alsa-project.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 2 insertions, 7 deletions

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 959ddbb0ca4d..1d0e89213a28 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -184,14 +184,9 @@ int vlan_proc_add_dev(struct net_device *vlandev)
  */
 int vlan_proc_rem_dev(struct net_device *vlandev)
 {
-        struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
-
         /** NOTE:  This will consume the memory pointed to by dent, it seems. */
-        if (vlan_dev_priv(vlandev)->dent) {
-                remove_proc_entry(vlan_dev_priv(vlandev)->dent->name,
-                                  vn->proc_vlan_dir);
-                vlan_dev_priv(vlandev)->dent = NULL;
-        }
+        proc_remove(vlan_dev_priv(vlandev)->dent);
+        vlan_dev_priv(vlandev)->dent = NULL;
         return 0;
 }