lkml.org 
[lkml]   [2017]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [Outreachy kernel] [PATCH v2] Staging: ccree: Merge assignment with return
    On Sat, Sep 9, 2017 at 2:28 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
    >
    >
    > On Sat, 9 Sep 2017, Srishti Sharma wrote:
    >
    >> Merge the assignment and return statements to return the value
    >> directly. Done using coccinelle.
    >>
    >> @@
    >> local idexpression ret;
    >> expression e;
    >> @@
    >>
    >> -ret =
    >> +return
    >> e;
    >> -return ret;
    >>
    >> Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
    >> ---
    >> Changes in v2:
    >> - Edit commit message so that it respects the 80 character limit.
    >>
    >> drivers/staging/ccree/ssi_aead.c | 18 ++++++------------
    >> 1 file changed, 6 insertions(+), 12 deletions(-)
    >>
    >> diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
    >> index 5abe6b2..f4532ea 100644
    >> --- a/drivers/staging/ccree/ssi_aead.c
    >> +++ b/drivers/staging/ccree/ssi_aead.c
    >> @@ -651,7 +651,7 @@ 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;
    >> +
    >>
    >
    > There is still a problem here. You don't need two blank lines under a
    > variable declaration.

    When I try to remove that extra blank line it looks like I deleted one
    blank line and added another one .

    Regards,
    Srishti

    >
    > julia
    >
    >> if (keylen < 3)
    >> return -EINVAL;
    >> @@ -659,9 +659,7 @@ static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsign
    >> 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,7 +2212,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);
    >>
    >> @@ -2224,15 +2222,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);
    >>
    >> @@ -2242,9 +2238,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+unsubscribe@googlegroups.com.
    >> To post to this group, send email to outreachy-kernel@googlegroups.com.
    >> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1504904135-3973-1-git-send-email-srishtishar%40gmail.com.
    >> For more options, visit https://groups.google.com/d/optout.
    >>

    \
     
     \ /
      Last update: 2017-09-08 23:16    [W:6.064 / U:1.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site