Skip to contentSkip to conversation

s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Jul 19, 2018

Subsystems (2)
s390 s390 DASD driver
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 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(-)
drivers/s390/block/dasd_eckd.c +1 -1
index bbf95b7..c5a5551 100644
@@ -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(
Signature · 1 line
2.7.4
Applied
#1 lore raw
Quoted 12 lines · On Wed, 18 Jul 2018 23:50:50 -0500 "Gustavo A. R. Silva"…

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(-)
drivers/s390/block/dasd_eckd.c +0 -0
index bbf95b7..c5a5551 100644

drivers/s390/block/dasd_eckd.c static int prepare_itcw(struct itcw *itcw, · line 3541

Quoted 8 lines
drivers/s390/block/dasd_eckd.c +1 -1
@@ -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.

Signature · 4 lines
blue skies,
   Martin.

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