| Message ID | 20200107200347.3374445-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] hsr: fix dummy hsr_debugfs_rename() declaration | expand |
From: Arnd Bergmann <arnd@arndb.de> Date: Tue, 7 Jan 2020 21:03:39 +0100 > The hsr_debugfs_rename prototype got an extra 'void' that needs to > be removed again: > > In file included from /git/arm-soc/net/hsr/hsr_main.c:12: > net/hsr/hsr_main.h:194:20: error: two or more data types in declaration specifiers > static inline void void hsr_debugfs_rename(struct net_device *dev) > > Fixes: 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks Arnd.
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index d40de84a637f..754d84b217f0 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -191,7 +191,7 @@ void hsr_debugfs_term(struct hsr_priv *priv); void hsr_debugfs_create_root(void); void hsr_debugfs_remove_root(void); #else -static inline void void hsr_debugfs_rename(struct net_device *dev) +static inline void hsr_debugfs_rename(struct net_device *dev) { } static inline void hsr_debugfs_init(struct hsr_priv *priv,
The hsr_debugfs_rename prototype got an extra 'void' that needs to be removed again: In file included from /git/arm-soc/net/hsr/hsr_main.c:12: net/hsr/hsr_main.h:194:20: error: two or more data types in declaration specifiers static inline void void hsr_debugfs_rename(struct net_device *dev) Fixes: 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- net/hsr/hsr_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)