linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO
@ 2018-07-19  4:50 Gustavo A. R. Silva
  2018-07-19 14:40 ` Martin Schwidefsky
  0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-19  4:50 UTC (permalink / raw)
  To: Stefan Haberland, Jan Hoeppner, 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>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO
  2018-07-19  4:50 [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO Gustavo A. R. Silva
@ 2018-07-19 14:40 ` Martin Schwidefsky
  0 siblings, 0 replies; 2+ messages in thread
From: Martin Schwidefsky @ 2018-07-19 14:40 UTC (permalink / raw)
  To: Gustavo A. R. Silva
  Cc: Stefan Haberland, Jan Hoeppner, Heiko Carstens, linux-s390, linux-kernel

On Wed, 18 Jul 2018 23:50:50 -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>
> ---
>  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.


^ 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  4:50 [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO Gustavo A. R. Silva
2018-07-19 14:40 ` 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).