Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, Sep 9, 2017 at 10:29 PM, Julia Lawallwrote: > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > >> Merge the assignment and return statements to return the value >> directly. Done using coccinelle. > > Coccinelle is not always perfect about pretty printing, so you have to > watch out for it. > >> >> @@ >> local idexpression ret; >> expression e; >> @@ >> >> -ret = >> +return >> e; >> -return ret; >> >> Signed-off-by: Srishti Sharma >> --- >> drivers/staging/ccree/ssi_sysfs.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/staging/ccree/ssi_sysfs.c >> b/drivers/staging/ccree/ssi_sysfs.c >> index 0655658..9fa7be0 100644 >> --- a/drivers/staging/ccree/ssi_sysfs.c >> +++ b/drivers/staging/ccree/ssi_sysfs.c >> @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir) >> >> int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata) >> { >> - int retval; >> > > This is going to leave a single empty line at the top of the function. > That is not needed. > >> #if defined CC_CYCLE_COUNT >> /* Init. statistics */ >> @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct >> ssi_drvdata *drvdata) >> SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name); >> >> /* Initialize top directory */ >> - retval = sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", >> + return sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", >> ssi_sys_top_level_attrs, >> ARRAY_SIZE(ssi_sys_top_level_attrs)); > > Previously the arguments were lined up with the right side of the ( but > now they are not. So move the above two lines to the left by 2 spaces. Thanks for this , I have re-sent the patch . Regards, Srishti > julia > >> - return retval; >> } >> >> void ssi_sysfs_fini(void) >> -- >> 2.7.4 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "outreachy-kernel" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to outreachy-kernel+unsubscr...@googlegroups.com. >> To post to this group, send email to outreachy-ker...@googlegroups.com. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >>
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, Sep 9, 2017 at 10:29 PM, Julia Lawall wrote: > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > >> Merge the assignment and return statements to return the value >> directly. Done using coccinelle. > > Coccinelle is not always perfect about pretty printing, so you have to > watch out for it. > >> >> @@ >> local idexpression ret; >> expression e; >> @@ >> >> -ret = >> +return >> e; >> -return ret; >> >> Signed-off-by: Srishti Sharma >> --- >> drivers/staging/ccree/ssi_sysfs.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/staging/ccree/ssi_sysfs.c >> b/drivers/staging/ccree/ssi_sysfs.c >> index 0655658..9fa7be0 100644 >> --- a/drivers/staging/ccree/ssi_sysfs.c >> +++ b/drivers/staging/ccree/ssi_sysfs.c >> @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir) >> >> int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata) >> { >> - int retval; >> > > This is going to leave a single empty line at the top of the function. > That is not needed. > >> #if defined CC_CYCLE_COUNT >> /* Init. statistics */ >> @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct >> ssi_drvdata *drvdata) >> SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name); >> >> /* Initialize top directory */ >> - retval = sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", >> + return sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", >> ssi_sys_top_level_attrs, >> ARRAY_SIZE(ssi_sys_top_level_attrs)); > > Previously the arguments were lined up with the right side of the ( but > now they are not. So move the above two lines to the left by 2 spaces. Thanks for this , I have re-sent the patch . Regards, Srishti > julia > >> - return retval; >> } >> >> void ssi_sysfs_fini(void) >> -- >> 2.7.4 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "outreachy-kernel" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to outreachy-kernel+unsubscr...@googlegroups.com. >> To post to this group, send email to outreachy-ker...@googlegroups.com. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >>
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > Merge the assignment and return statements to return the value > directly. Done using coccinelle. Coccinelle is not always perfect about pretty printing, so you have to watch out for it. > > @@ > local idexpression ret; > expression e; > @@ > > -ret = > +return > e; > -return ret; > > Signed-off-by: Srishti Sharma> --- > drivers/staging/ccree/ssi_sysfs.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_sysfs.c > b/drivers/staging/ccree/ssi_sysfs.c > index 0655658..9fa7be0 100644 > --- a/drivers/staging/ccree/ssi_sysfs.c > +++ b/drivers/staging/ccree/ssi_sysfs.c > @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir) > > int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata) > { > - int retval; > This is going to leave a single empty line at the top of the function. That is not needed. > #if defined CC_CYCLE_COUNT > /* Init. statistics */ > @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct > ssi_drvdata *drvdata) > SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name); > > /* Initialize top directory */ > - retval = sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", > + return sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", > ssi_sys_top_level_attrs, > ARRAY_SIZE(ssi_sys_top_level_attrs)); Previously the arguments were lined up with the right side of the ( but now they are not. So move the above two lines to the left by 2 spaces. julia > - return retval; > } > > void ssi_sysfs_fini(void) > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > Merge the assignment and return statements to return the value > directly. Done using coccinelle. Coccinelle is not always perfect about pretty printing, so you have to watch out for it. > > @@ > local idexpression ret; > expression e; > @@ > > -ret = > +return > e; > -return ret; > > Signed-off-by: Srishti Sharma > --- > drivers/staging/ccree/ssi_sysfs.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_sysfs.c > b/drivers/staging/ccree/ssi_sysfs.c > index 0655658..9fa7be0 100644 > --- a/drivers/staging/ccree/ssi_sysfs.c > +++ b/drivers/staging/ccree/ssi_sysfs.c > @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir) > > int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata) > { > - int retval; > This is going to leave a single empty line at the top of the function. That is not needed. > #if defined CC_CYCLE_COUNT > /* Init. statistics */ > @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct > ssi_drvdata *drvdata) > SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name); > > /* Initialize top directory */ > - retval = sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", > + return sys_init_dir(_top_dir, drvdata, sys_dev_obj, "cc_info", > ssi_sys_top_level_attrs, > ARRAY_SIZE(ssi_sys_top_level_attrs)); Previously the arguments were lined up with the right side of the ( but now they are not. So move the above two lines to the left by 2 spaces. julia > - return retval; > } > > void ssi_sysfs_fini(void) > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > On Sat, Sep 9, 2017 at 1:42 AM, Julia Lawallwrote: > > > > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > > > >> Return the return value of a function directly, instead of first saving it > >> in a variable and then returning it. This change was made using the > >> following > > > > Your commit message should respect the 80 character limit. The above is > > one very long line. > > Yes, I'll fix it . Thanks > > > >> semantic patch by coccinelle. > >> > >> @@ > >> local idexpression ret; > >> expression e; > >> @@ > >> > >> -ret = > >> +return > >> e; > >> -return ret; > >> > >> Signed-off-by: Srishti Sharma > >> --- > >> drivers/staging/ccree/ssi_aead.c | 21 ++--- > >> 1 file changed, 6 insertions(+), 15 deletions(-) > >> > >> diff --git a/drivers/staging/ccree/ssi_aead.c > >> b/drivers/staging/ccree/ssi_aead.c > >> index 5abe6b2..6bb98f7 100644 > >> --- a/drivers/staging/ccree/ssi_aead.c > >> +++ b/drivers/staging/ccree/ssi_aead.c > >> @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 > >> *key, unsigned int keylen) > >> static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > > > > I'm not sure what happened here, but you should not be removing and then > > adding back a blank line. Likewise below. > > Sorry , I must have removed an already existing blank line by mistake > and must have re-added it upon realising the same. I'll fix these and > send again. There must be some change in spacing. Otherwise there would be no diff. julia > > Regards, > Srishti > > > > > julia > > > >> if (keylen < 3) > >> return -EINVAL; > >> > >> keylen -= 3; > >> memcpy(ctx->ctr_nonce, key + keylen, 3); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> #endif /*SSI_CC_HAS_AES_CCM*/ > >> > >> @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct > >> aead_request *req) > >> static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > >> > >> if (keylen < 4) > >> @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct > >> crypto_aead *tfm, const u8 *key, unsign > >> keylen -= 4; > >> memcpy(ctx->ctr_nonce, key + keylen, 4); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> > >> static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > >> > >> if (keylen < 4) > >> @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead > >> *tfm, const u8 *key, unsign > >> keylen -= 4; > >> memcpy(ctx->ctr_nonce, key + keylen, 4); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> > >> static int ssi_gcm_setauthsize(struct crypto_aead *authenc, > >> -- > >> 2.7.4 > >> > >> -- > >> You received this message because you are subscribed to the Google Groups > >> "outreachy-kernel" group. > >> To unsubscribe from this group and stop receiving emails from it, send an > >> email to outreachy-kernel+unsubscr...@googlegroups.com. > >> To post to this group, send email to outreachy-ker...@googlegroups.com. > >> To view this discussion on the web visit > >> https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. > >> For more options, visit https://groups.google.com/d/optout. > >> > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/CAB3L5ow4-GeOfh%3D23T58JNUmxu4mmOoG1rwH6fccrzwTNvTu1w%40mail.gmail.com. > For more options, visit https://groups.google.com/d/optout. >
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > On Sat, Sep 9, 2017 at 1:42 AM, Julia Lawall wrote: > > > > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > > > >> Return the return value of a function directly, instead of first saving it > >> in a variable and then returning it. This change was made using the > >> following > > > > Your commit message should respect the 80 character limit. The above is > > one very long line. > > Yes, I'll fix it . Thanks > > > >> semantic patch by coccinelle. > >> > >> @@ > >> local idexpression ret; > >> expression e; > >> @@ > >> > >> -ret = > >> +return > >> e; > >> -return ret; > >> > >> Signed-off-by: Srishti Sharma > >> --- > >> drivers/staging/ccree/ssi_aead.c | 21 ++--- > >> 1 file changed, 6 insertions(+), 15 deletions(-) > >> > >> diff --git a/drivers/staging/ccree/ssi_aead.c > >> b/drivers/staging/ccree/ssi_aead.c > >> index 5abe6b2..6bb98f7 100644 > >> --- a/drivers/staging/ccree/ssi_aead.c > >> +++ b/drivers/staging/ccree/ssi_aead.c > >> @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 > >> *key, unsigned int keylen) > >> static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > > > > I'm not sure what happened here, but you should not be removing and then > > adding back a blank line. Likewise below. > > Sorry , I must have removed an already existing blank line by mistake > and must have re-added it upon realising the same. I'll fix these and > send again. There must be some change in spacing. Otherwise there would be no diff. julia > > Regards, > Srishti > > > > > julia > > > >> if (keylen < 3) > >> return -EINVAL; > >> > >> keylen -= 3; > >> memcpy(ctx->ctr_nonce, key + keylen, 3); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> #endif /*SSI_CC_HAS_AES_CCM*/ > >> > >> @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct > >> aead_request *req) > >> static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > >> > >> if (keylen < 4) > >> @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct > >> crypto_aead *tfm, const u8 *key, unsign > >> keylen -= 4; > >> memcpy(ctx->ctr_nonce, key + keylen, 4); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> > >> static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > >> unsigned int keylen) > >> { > >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > >> - int rc = 0; > >> - > >> + > >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > >> > >> if (keylen < 4) > >> @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead > >> *tfm, const u8 *key, unsign > >> keylen -= 4; > >> memcpy(ctx->ctr_nonce, key + keylen, 4); > >> > >> - rc = ssi_aead_setkey(tfm, key, keylen); > >> - > >> - return rc; > >> + return ssi_aead_setkey(tfm, key, keylen); > >> } > >> > >> static int ssi_gcm_setauthsize(struct crypto_aead *authenc, > >> -- > >> 2.7.4 > >> > >> -- > >> You received this message because you are subscribed to the Google Groups > >> "outreachy-kernel" group. > >> To unsubscribe from this group and stop receiving emails from it, send an > >> email to outreachy-kernel+unsubscr...@googlegroups.com. > >> To post to this group, send email to outreachy-ker...@googlegroups.com. > >> To view this discussion on the web visit > >> https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. > >> For more options, visit https://groups.google.com/d/optout. > >> > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/CAB3L5ow4-GeOfh%3D23T58JNUmxu4mmOoG1rwH6fccrzwTNvTu1w%40mail.gmail.com. > For more options, visit https://groups.google.com/d/optout. >
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, Sep 9, 2017 at 1:42 AM, Julia Lawallwrote: > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > >> Return the return value of a function directly, instead of first saving it >> in a variable and then returning it. This change was made using the following > > Your commit message should respect the 80 character limit. The above is > one very long line. Yes, I'll fix it . Thanks > >> semantic patch by coccinelle. >> >> @@ >> local idexpression ret; >> expression e; >> @@ >> >> -ret = >> +return >> e; >> -return ret; >> >> Signed-off-by: Srishti Sharma >> --- >> drivers/staging/ccree/ssi_aead.c | 21 ++--- >> 1 file changed, 6 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/staging/ccree/ssi_aead.c >> b/drivers/staging/ccree/ssi_aead.c >> index 5abe6b2..6bb98f7 100644 >> --- a/drivers/staging/ccree/ssi_aead.c >> +++ b/drivers/staging/ccree/ssi_aead.c >> @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 >> *key, unsigned int keylen) >> static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + > > I'm not sure what happened here, but you should not be removing and then > adding back a blank line. Likewise below. Sorry , I must have removed an already existing blank line by mistake and must have re-added it upon realising the same. I'll fix these and send again. Regards, Srishti > > julia > >> if (keylen < 3) >> return -EINVAL; >> >> keylen -= 3; >> memcpy(ctx->ctr_nonce, key + keylen, 3); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> #endif /*SSI_CC_HAS_AES_CCM*/ >> >> @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct aead_request >> *req) >> static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); >> >> if (keylen < 4) >> @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead >> *tfm, const u8 *key, unsign >> keylen -= 4; >> memcpy(ctx->ctr_nonce, key + keylen, 4); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> >> static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); >> >> if (keylen < 4) >> @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead >> *tfm, const u8 *key, unsign >> keylen -= 4; >> memcpy(ctx->ctr_nonce, key + keylen, 4); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> >> static int ssi_gcm_setauthsize(struct crypto_aead *authenc, >> -- >> 2.7.4 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "outreachy-kernel" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to outreachy-kernel+unsubscr...@googlegroups.com. >> To post to this group, send email to outreachy-ker...@googlegroups.com. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >>
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, Sep 9, 2017 at 1:42 AM, Julia Lawall wrote: > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > >> Return the return value of a function directly, instead of first saving it >> in a variable and then returning it. This change was made using the following > > Your commit message should respect the 80 character limit. The above is > one very long line. Yes, I'll fix it . Thanks > >> semantic patch by coccinelle. >> >> @@ >> local idexpression ret; >> expression e; >> @@ >> >> -ret = >> +return >> e; >> -return ret; >> >> Signed-off-by: Srishti Sharma >> --- >> drivers/staging/ccree/ssi_aead.c | 21 ++--- >> 1 file changed, 6 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/staging/ccree/ssi_aead.c >> b/drivers/staging/ccree/ssi_aead.c >> index 5abe6b2..6bb98f7 100644 >> --- a/drivers/staging/ccree/ssi_aead.c >> +++ b/drivers/staging/ccree/ssi_aead.c >> @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 >> *key, unsigned int keylen) >> static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + > > I'm not sure what happened here, but you should not be removing and then > adding back a blank line. Likewise below. Sorry , I must have removed an already existing blank line by mistake and must have re-added it upon realising the same. I'll fix these and send again. Regards, Srishti > > julia > >> if (keylen < 3) >> return -EINVAL; >> >> keylen -= 3; >> memcpy(ctx->ctr_nonce, key + keylen, 3); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> #endif /*SSI_CC_HAS_AES_CCM*/ >> >> @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct aead_request >> *req) >> static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); >> >> if (keylen < 4) >> @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead >> *tfm, const u8 *key, unsign >> keylen -= 4; >> memcpy(ctx->ctr_nonce, key + keylen, 4); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> >> static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, >> unsigned int keylen) >> { >> struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); >> - int rc = 0; >> - >> + >> SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); >> >> if (keylen < 4) >> @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead >> *tfm, const u8 *key, unsign >> keylen -= 4; >> memcpy(ctx->ctr_nonce, key + keylen, 4); >> >> - rc = ssi_aead_setkey(tfm, key, keylen); >> - >> - return rc; >> + return ssi_aead_setkey(tfm, key, keylen); >> } >> >> static int ssi_gcm_setauthsize(struct crypto_aead *authenc, >> -- >> 2.7.4 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "outreachy-kernel" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to outreachy-kernel+unsubscr...@googlegroups.com. >> To post to this group, send email to outreachy-ker...@googlegroups.com. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >>
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > Return the return value of a function directly, instead of first saving it in > a variable and then returning it. This change was made using the following Your commit message should respect the 80 character limit. The above is one very long line. > semantic patch by coccinelle. > > @@ > local idexpression ret; > expression e; > @@ > > -ret = > +return > e; > -return ret; > > Signed-off-by: Srishti Sharma> --- > drivers/staging/ccree/ssi_aead.c | 21 ++--- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_aead.c > b/drivers/staging/ccree/ssi_aead.c > index 5abe6b2..6bb98f7 100644 > --- a/drivers/staging/ccree/ssi_aead.c > +++ b/drivers/staging/ccree/ssi_aead.c > @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + I'm not sure what happened here, but you should not be removing and then adding back a blank line. Likewise below. julia > if (keylen < 3) > return -EINVAL; > > keylen -= 3; > memcpy(ctx->ctr_nonce, key + keylen, 3); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > #endif /*SSI_CC_HAS_AES_CCM*/ > > @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct aead_request > *req) > static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + > SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > > if (keylen < 4) > @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead > *tfm, const u8 *key, unsign > keylen -= 4; > memcpy(ctx->ctr_nonce, key + keylen, 4); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > > static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + > SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > > if (keylen < 4) > @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead > *tfm, const u8 *key, unsign > keylen -= 4; > memcpy(ctx->ctr_nonce, key + keylen, 4); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > > static int ssi_gcm_setauthsize(struct crypto_aead *authenc, > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return
On Sat, 9 Sep 2017, Srishti Sharma wrote: > Return the return value of a function directly, instead of first saving it in > a variable and then returning it. This change was made using the following Your commit message should respect the 80 character limit. The above is one very long line. > semantic patch by coccinelle. > > @@ > local idexpression ret; > expression e; > @@ > > -ret = > +return > e; > -return ret; > > Signed-off-by: Srishti Sharma > --- > drivers/staging/ccree/ssi_aead.c | 21 ++--- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_aead.c > b/drivers/staging/ccree/ssi_aead.c > index 5abe6b2..6bb98f7 100644 > --- a/drivers/staging/ccree/ssi_aead.c > +++ b/drivers/staging/ccree/ssi_aead.c > @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + I'm not sure what happened here, but you should not be removing and then adding back a blank line. Likewise below. julia > if (keylen < 3) > return -EINVAL; > > keylen -= 3; > memcpy(ctx->ctr_nonce, key + keylen, 3); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > #endif /*SSI_CC_HAS_AES_CCM*/ > > @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct aead_request > *req) > static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + > SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > > if (keylen < 4) > @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead > *tfm, const u8 *key, unsign > keylen -= 4; > memcpy(ctx->ctr_nonce, key + keylen, 4); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > > static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, > unsigned int keylen) > { > struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); > - int rc = 0; > - > + > SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); > > if (keylen < 4) > @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead > *tfm, const u8 *key, unsign > keylen -= 4; > memcpy(ctx->ctr_nonce, key + keylen, 4); > > - rc = ssi_aead_setkey(tfm, key, keylen); > - > - return rc; > + return ssi_aead_setkey(tfm, key, keylen); > } > > static int ssi_gcm_setauthsize(struct crypto_aead *authenc, > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups > "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to outreachy-kernel+unsubscr...@googlegroups.com. > To post to this group, send email to outreachy-ker...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/1504900895-13110-1-git-send-email-srishtishar%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >