2018-07-19 04:51:52

by Gustavo A. R. Silva

Subject: [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO

PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/s390/block/dasd_eckd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index bbf95b7..c5a5551 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -3535,7 +3535,7 @@ static int prepare_itcw(struct itcw *itcw,

dcw = itcw_add_dcw(itcw, pfx_cmd, 0,
&pfxdata, sizeof(pfxdata), total_data_size);
- return PTR_RET(dcw);
+ return PTR_ERR_OR_ZERO(dcw);
}

static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
--
2.7.4

2018-07-19 14:43:32

by Martin Schwidefsky

Subject: Re: [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO

On Wed, 18 Jul 2018 23:50:50 -0500
"Gustavo A. R. Silva" <[email protected]> wrote:

> PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/s390/block/dasd_eckd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
> index bbf95b7..c5a5551 100644
> --- a/drivers/s390/block/dasd_eckd.c
> +++ b/drivers/s390/block/dasd_eckd.c
> @@ -3535,7 +3535,7 @@ static int prepare_itcw(struct itcw *itcw,
>
> dcw = itcw_add_dcw(itcw, pfx_cmd, 0,
> &pfxdata, sizeof(pfxdata), total_data_size);
> - return PTR_RET(dcw);
> + return PTR_ERR_OR_ZERO(dcw);
> }
>
> static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(

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

--
blue skies,
Martin.

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