2018-07-19 04:42:56

by Gustavo A. R. Silva

Subject: [PATCH] s390/ap_bus: 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/crypto/ap_bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index c0a6723..bf27fc4 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -474,7 +474,7 @@ static int ap_poll_thread_start(void)
return 0;
mutex_lock(&ap_poll_thread_mutex);
ap_poll_kthread = kthread_run(ap_poll_thread, NULL, "appoll");
- rc = PTR_RET(ap_poll_kthread);
+ rc = PTR_ERR_OR_ZERO(ap_poll_kthread);
if (rc)
ap_poll_kthread = NULL;
mutex_unlock(&ap_poll_thread_mutex);
@@ -1242,7 +1242,7 @@ static int __init ap_module_init(void)

/* Create /sys/devices/ap. */
ap_root_device = root_device_register("ap");
- rc = PTR_RET(ap_root_device);
+ rc = PTR_ERR_OR_ZERO(ap_root_device);
if (rc)
goto out_bus;

--
2.7.4

2018-07-19 14:41:40

by Martin Schwidefsky

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

On Wed, 18 Jul 2018 23:42:05 -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/crypto/ap_bus.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
> index c0a6723..bf27fc4 100644
> --- a/drivers/s390/crypto/ap_bus.c
> +++ b/drivers/s390/crypto/ap_bus.c
> @@ -474,7 +474,7 @@ static int ap_poll_thread_start(void)
> return 0;
> mutex_lock(&ap_poll_thread_mutex);
> ap_poll_kthread = kthread_run(ap_poll_thread, NULL, "appoll");
> - rc = PTR_RET(ap_poll_kthread);
> + rc = PTR_ERR_OR_ZERO(ap_poll_kthread);
> if (rc)
> ap_poll_kthread = NULL;
> mutex_unlock(&ap_poll_thread_mutex);
> @@ -1242,7 +1242,7 @@ static int __init ap_module_init(void)
>
> /* Create /sys/devices/ap. */
> ap_root_device = root_device_register("ap");
> - rc = PTR_RET(ap_root_device);
> + rc = PTR_ERR_OR_ZERO(ap_root_device);
> if (rc)
> goto out_bus;
>

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

--
blue skies,
Martin.

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

2018-07-19 14:42:02

by Harald Freudenberger

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

On 19.07.2018 06:42, Gustavo A. R. Silva wrote:
> PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/s390/crypto/ap_bus.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
> index c0a6723..bf27fc4 100644
> --- a/drivers/s390/crypto/ap_bus.c
> +++ b/drivers/s390/crypto/ap_bus.c
> @@ -474,7 +474,7 @@ static int ap_poll_thread_start(void)
> return 0;
> mutex_lock(&ap_poll_thread_mutex);
> ap_poll_kthread = kthread_run(ap_poll_thread, NULL, "appoll");
> - rc = PTR_RET(ap_poll_kthread);
> + rc = PTR_ERR_OR_ZERO(ap_poll_kthread);
> if (rc)
> ap_poll_kthread = NULL;
> mutex_unlock(&ap_poll_thread_mutex);
> @@ -1242,7 +1242,7 @@ static int __init ap_module_init(void)
>
> /* Create /sys/devices/ap. */
> ap_root_device = root_device_register("ap");
> - rc = PTR_RET(ap_root_device);
> + rc = PTR_ERR_OR_ZERO(ap_root_device);
> if (rc)
> goto out_bus;
>

Reviewed-by: Harald Freudenberger <[email protected]>