Re: [net-next] vlan: change return type of vlan_proc_rem_dev

On Wed, Feb 17, 2016 at 3:44 AM, Zhang Shengju
[off-list ref] wrote:

quoted

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

Signed-off-by: Zhang Shengju <redacted>
---
 net/8021q/vlanproc.c | 3 +--
 net/8021q/vlanproc.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index

ae63cf7..5f1446c 100644

--- 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.

*/

quoted

        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

063f60a..a9d8734 100644

--- 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);

You forget to change the !PROC_FS case:

#define vlan_proc_rem_dev(dev)  ({(void)(dev), 0; })

Thanks, I will add the missing part.