Re: [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO

[Martin Schwidefsky]

On Thu, 19 Jul 2018 00:08:30 -0500
"Gustavo A. R. Silva" <gustavo@xxxxxxxxxxxxxx> wrote:

> PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx>
> ---
>  arch/s390/hypfs/hypfs_diag.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
> index a2945b2..3452e18 100644
> --- a/arch/s390/hypfs/hypfs_diag.c
> +++ b/arch/s390/hypfs/hypfs_diag.c
> @@ -497,7 +497,7 @@ static int hypfs_create_cpu_files(struct dentry *cpus_dir, void *cpu_info)
>  	}
>  	diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer);
>  	rc = hypfs_create_str(cpu_dir, "type", buffer);
> -	return PTR_RET(rc);
> +	return PTR_ERR_OR_ZERO(rc);
>  }
> 
>  static void *hypfs_create_lpar_files(struct dentry *systems_dir, void *part_hdr)
> @@ -544,7 +544,7 @@ static int hypfs_create_phys_cpu_files(struct dentry *cpus_dir, void *cpu_info)
>  		return PTR_ERR(rc);
>  	diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer);
>  	rc = hypfs_create_str(cpu_dir, "type", buffer);
> -	return PTR_RET(rc);
> +	return PTR_ERR_OR_ZERO(rc);
>  }
> 
>  static void *hypfs_create_phys_files(struct dentry *parent_dir, void *phys_hdr)

Applied to the s390/linux tree for the next merge window. Thanks.

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.