* [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO
@ 2018-07-19 5:08 Gustavo A. R. Silva
2018-07-19 14:41 ` Martin Schwidefsky
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-19 5:08 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: linux-s390, linux-kernel, Gustavo A. R. Silva
PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
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)
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO
2018-07-19 5:08 [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO Gustavo A. R. Silva
@ 2018-07-19 14:41 ` Martin Schwidefsky
0 siblings, 0 replies; 2+ messages in thread
From: Martin Schwidefsky @ 2018-07-19 14:41 UTC (permalink / raw)
To: Gustavo A. R. Silva; +Cc: Heiko Carstens, linux-s390, linux-kernel
On Thu, 19 Jul 2018 00:08:30 -0500
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-19 14:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-19 5:08 [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO Gustavo A. R. Silva
2018-07-19 14:41 ` Martin Schwidefsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).