2012-08-15 19:25:59

by Syam Sidhardhan

Subject: [PATCH] NFC: Remove repeated code for NULL check

This patch remove the repeated code for checking llcp_sock &
llcp_sock->dev against NULL.

Signed-off-by: Syam Sidhardhan <[email protected]>
---
net/nfc/llcp/sock.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index ddeb9aa..6e188d4 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -300,9 +300,6 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx,
llcp_sock->dsap, llcp_sock->ssap);

- if (llcp_sock == NULL || llcp_sock->dev == NULL)
- return -EBADFD;
-
uaddr->sa_family = AF_NFC;

*len = sizeof(struct sockaddr_nfc_llcp);
--
1.7.9.5

2012-08-17 22:03:01

by Samuel Ortiz

Subject: Re: [PATCH] NFC: Remove repeated code for NULL check

Hi Syam,

On Thu, Aug 16, 2012 at 12:55:43AM +0530, Syam Sidhardhan wrote:
> This patch remove the repeated code for checking llcp_sock &
> llcp_sock->dev against NULL.
>
> Signed-off-by: Syam Sidhardhan <[email protected]>
> ---
> net/nfc/llcp/sock.c | 3 ---
> 1 file changed, 3 deletions(-)
Applied to my nfc-next branch, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/