]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
irda: Delete an unnecessary check before the function call "irlmp_unregister_service"
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 3 Nov 2015 17:18:37 +0000 (18:18 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Nov 2015 18:30:47 +0000 (13:30 -0500)
The irlmp_unregister_service() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/irda/af_irda.c

index fae6822cc367631ca403cc6207f800cf2571dfea..e6aa48b5395c67e2600eed9482c97b9a626d01bd 100644 (file)
@@ -2123,8 +2123,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
                }
 
                /* Unregister any old registration */
-               if (self->skey)
-                       irlmp_unregister_service(self->skey);
+               irlmp_unregister_service(self->skey);
 
                self->skey = irlmp_register_service((__u16) opt);
                break;