vlan: change return type of vlan_proc_rem_dev

Since function vlan_proc_rem_dev() will only return 0, it's better to
return void instead of int.

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index ae63cf72a953ca0f733b7b9e8cfb61dc9012da3c..5f1446c9f09813c3a05e4e0f01b6861f83d01535 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -184,12 +184,11 @@ int vlan_proc_add_dev(struct net_device *vlandev)
 /*
  *     Delete directory entry for VLAN device.
  */
-int vlan_proc_rem_dev(struct net_device *vlandev)
+void vlan_proc_rem_dev(struct net_device *vlandev)
 {
        /** NOTE:  This will consume the memory pointed to by dent, it seems. */
        proc_remove(vlan_dev_priv(vlandev)->dent);
        vlan_dev_priv(vlandev)->dent = NULL;
-       return 0;
 }
 
 /****** Proc filesystem entry points ****************************************/

diff --git a/net/8021q/vlanproc.h b/net/8021q/vlanproc.h
index 063f60a3d5cc2ee05c724dd76e647596d677fddf..8838a2e92eb696c2ce199692bc2d87856d4a109d 100644 (file)
--- a/net/8021q/vlanproc.h
+++ b/net/8021q/vlanproc.h
@@ -5,7 +5,7 @@
 struct net;
 
 int vlan_proc_init(struct net *net);
-int vlan_proc_rem_dev(struct net_device *vlandev);
+void vlan_proc_rem_dev(struct net_device *vlandev);
 int vlan_proc_add_dev(struct net_device *vlandev);
 void vlan_proc_cleanup(struct net *net);
 
@@ -14,7 +14,7 @@ void vlan_proc_cleanup(struct net *net);
 #define vlan_proc_init(net)    (0)
 #define vlan_proc_cleanup(net) do {} while (0)
 #define vlan_proc_add_dev(dev) ({(void)(dev), 0; })
-#define vlan_proc_rem_dev(dev) ({(void)(dev), 0; })
+#define vlan_proc_rem_dev(dev) do {} while (0)
 #endif
 
 #endif /* !(__BEN_VLAN_PROC_INC__) */