Skip to contentSkip to conversation

s390/tape: replace PTR_RET with PTR_ERR_OR_ZERO

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

lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 s390/tape: 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/char/tape_class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/char/tape_class.c +1 -1
index e403edf..b58df0d 100644
@@ -77,7 +77,7 @@ struct tape_class_device *register_tape_dev(
 	tcd->class_device = device_create(tape_class, device,
 					  tcd->char_device->dev, NULL,
 					  "%s", tcd->device_name);
-	rc = PTR_RET(tcd->class_device);
+	rc = PTR_ERR_OR_ZERO(tcd->class_device);
 	if (rc)
 		goto fail_with_cdev;
 	rc = sysfs_create_link(
Signature · 1 line
2.7.4
Applied
#1 lore raw
Quoted 12 lines · On Wed, 18 Jul 2018 23:46:53 -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/char/tape_class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/char/tape_class.c +0 -0
index e403edf..b58df0d 100644

drivers/s390/char/tape_class.c struct tape_class_device *register_tape_dev( · line 83

Quoted 8 lines
drivers/s390/char/tape_class.c +1 -1
@@ -77,7 +77,7 @@ struct tape_class_device *register_tape_dev(
 	tcd->class_device = device_create(tape_class, device,
 					  tcd->char_device->dev, NULL,
 					  "%s", tcd->device_name);
-	rc = PTR_RET(tcd->class_device);
+	rc = PTR_ERR_OR_ZERO(tcd->class_device);
 	if (rc)
 		goto fail_with_cdev;
 	rc = sysfs_create_link(

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.