The following commit has been merged in the master branch: commit 3f87c4239fa1df61beffbee2ca00e8ffbe31a5e3 Author: Antonio Quartulli ordex@autistici.org Date: Thu Nov 29 01:03:31 2012 +0100

batman-adv: remove useless NULL check

debugfs_remove_recursive() checks whether its argument is not null on its own, therefore it is possible to remove the external check.

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 0049837..5136d32 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -396,10 +396,8 @@ err:

void batadv_debugfs_destroy(void) { - if (batadv_debugfs) { - debugfs_remove_recursive(batadv_debugfs); - batadv_debugfs = NULL; - } + debugfs_remove_recursive(batadv_debugfs); + batadv_debugfs = NULL; }

int batadv_debugfs_add_meshif(struct net_device *dev)