[PATCH 1/1] net/caif/caif_socket.c: remove unnecessary null test before debugfs_remove_recursive

[PATCH 1/1] net/caif/caif_socket.c: remove unnecessary null test before debugfs_remove_recursive

[Fabian Frederick]

based on checkpatch:
"debugfs_remove_recursive(NULL) is safe this check is probably not required"

Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 net/caif/caif_socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index e843709..43f750e 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -908,8 +908,7 @@ static int caif_release(struct socket *sock)
 	sock->sk = NULL;
 
 	WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
-	if (cf_sk->debugfs_socket_dir != NULL)
-		debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
+	debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
 
 	lock_sock(&(cf_sk->sk));
 	sk->sk_state = CAIF_DISCONNECTED;
-- 
1.8.4.5

Re: [PATCH 1/1] net/caif/caif_socket.c: remove unnecessary null test before debugfs_remove_recursive

[David Miller]

From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 27 Jun 2014 23:07:43 +0200

> based on checkpatch:
> "debugfs_remove_recursive(NULL) is safe this check is probably not required"
> 
> Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Also applied to net-next, thanks.