Re: [PATCH 1/1] ppp: remove NULL check before kfree

From: Maninder Singh <hidden>
Date: 2015-06-24 11:05:55

quoted hunk
No need of explicit NULL check before kfree,
removing the same and little coding style changes.

Signed-off-by: Maninder Singh <redacted>
Reviewed-by: Vaneet narang <redacted>
---
drivers/net/ppp/ppp_mppe.c |   10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index 05005c6..06f60b1 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -238,12 +238,11 @@ static void *mppe_alloc(unsigned char *options, int optlen)
	return (void *)state;

	out_free:
-	    if (state->sha1_digest)
		kfree(state->sha1_digest);
	    if (state->sha1)
-		crypto_free_hash(state->sha1);
+			crypto_free_hash(state->sha1);
	    if (state->arc4)
-		crypto_free_blkcipher(state->arc4);
+			crypto_free_blkcipher(state->arc4);
	    kfree(state);
	out:
	return NULL;
@@ -256,12 +255,11 @@ static void mppe_free(void *arg)
{
	struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
	if (state) {
-	    if (state->sha1_digest)
		kfree(state->sha1_digest);
	    if (state->sha1)
-		crypto_free_hash(state->sha1);
+			crypto_free_hash(state->sha1);
	    if (state->arc4)
-		crypto_free_blkcipher(state->arc4);
+			crypto_free_blkcipher(state->arc4);
	    kfree(state);
	}
}
-- 
1.7.9.5
Send V2 of patch with some more changes.
Thanks
Maninder
-------
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help