2018-07-19 04:47:49

by Gustavo A. R. Silva

Subject: [PATCH] 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(-)

diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index e403edf..b58df0d 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -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(
--
2.7.4

2018-07-19 14:42:28

by Martin Schwidefsky

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

On Wed, 18 Jul 2018 23:46:53 -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/char/tape_class.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
> index e403edf..b58df0d 100644
> --- a/drivers/s390/char/tape_class.c
> +++ b/drivers/s390/char/tape_class.c
> @@ -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.


--
blue skies,
Martin.

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