nvme/auth: optimize code redundancy and provide code quality

[PATCH] nvme/auth: optimize code redundancy and provide code quality

Posted by mengfanhui 1 year, 11 months ago

Improve code quality. Reduce code redundancy.

Signed-off-by: mengfanhui <mengfanhui@kylinos.cn>
---
 drivers/nvme/common/auth.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/nvme/common/auth.c b/drivers/nvme/common/auth.c
index a23ab5c968b9..4f9d06afdc38 100644
--- a/drivers/nvme/common/auth.c
+++ b/drivers/nvme/common/auth.c
@@ -250,9 +250,7 @@ struct nvme_dhchap_key *nvme_auth_transform_key(
 	if (key->hash == 0) {
 		key_len = nvme_auth_key_struct_size(key->len);
 		transformed_key = kmemdup(key, key_len, GFP_KERNEL);
-		if (!transformed_key)
-			return ERR_PTR(-ENOMEM);
-		return transformed_key;
+		return transformed_key ? transformed_key : ERR_PTR(-ENOMEM);
 	}
 	hmac_name = nvme_auth_hmac_name(key->hash);
 	if (!hmac_name) {

base-commit: c29901006179c4c87f9335771e50814ec5707239
-- 
2.25.1

Re: [PATCH] nvme/auth: optimize code redundancy and provide code quality

Posted by Sagi Grimberg 1 year, 11 months ago

> Improve code quality. Reduce code redundancy.

Why does this improve code quality? Why does this
reduce code redundancy?

It's just a different style, seems like a useless change to me.

> 
> Signed-off-by: mengfanhui <mengfanhui@kylinos.cn>
> ---
>   drivers/nvme/common/auth.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/nvme/common/auth.c b/drivers/nvme/common/auth.c
> index a23ab5c968b9..4f9d06afdc38 100644
> --- a/drivers/nvme/common/auth.c
> +++ b/drivers/nvme/common/auth.c
> @@ -250,9 +250,7 @@ struct nvme_dhchap_key *nvme_auth_transform_key(
>   	if (key->hash == 0) {
>   		key_len = nvme_auth_key_struct_size(key->len);
>   		transformed_key = kmemdup(key, key_len, GFP_KERNEL);
> -		if (!transformed_key)
> -			return ERR_PTR(-ENOMEM);
> -		return transformed_key;
> +		return transformed_key ? transformed_key : ERR_PTR(-ENOMEM);
>   	}
>   	hmac_name = nvme_auth_hmac_name(key->hash);
>   	if (!hmac_name) {
> 
> base-commit: c29901006179c4c87f9335771e50814ec5707239

Re: [PATCH] nvme/auth: optimize code redundancy and provide code quality

Posted by Chaitanya Kulkarni 1 year, 11 months ago

>> +        return transformed_key ? transformed_key : ERR_PTR(-ENOMEM);

I've received many comments about not using ?: in kernel code as
if .. else is preferred way, not sure if this is a good idea

-ck