2012-08-28 13:02:41

by Wei Yongjun

Subject: [PATCH] NFC: remove pointless conditional before kfree_skb()

From: Wei Yongjun <[email protected]>

Remove pointless conditional before kfree_skb().

Signed-off-by: Wei Yongjun <[email protected]>
---
net/nfc/hci/shdlc.c | 3 +--
net/nfc/hci/core.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index 6f840c1..52e5cbb 100644
--- a/net/nfc/hci/shdlc.c
+++ b/net/nfc/hci/shdlc.c
@@ -241,8 +241,7 @@ static void nfc_shdlc_rcv_i_frame(struct nfc_shdlc *shdlc,
}

exit:
- if (skb)
- kfree_skb(skb);
+ kfree_skb(skb);
}

static void nfc_shdlc_rcv_ack(struct nfc_shdlc *shdlc, int y_nr)

diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 1ac7b3f..35413cc 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -398,8 +398,7 @@ disconnect_all:
nfc_hci_disconnect_all_gates(hdev);

exit:
- if (skb)
- kfree_skb(skb);
+ kfree_skb(skb);

return r;
}

2012-09-07 16:49:17

by Samuel Ortiz

Subject: Re: [PATCH] NFC: remove pointless conditional before kfree_skb()

Hi Wei,

On Tue, Aug 28, 2012 at 09:02:40PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Remove pointless conditional before kfree_skb().
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> net/nfc/hci/shdlc.c | 3 +--
> net/nfc/hci/core.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
Thanks, patch applied to my nfc-next branch.

Cheers,
Samuel.

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