2013-06-01 09:51:26

by Thomas Meyer

Subject: [PATCH] s390/ap: Cocci spatch "ptr_ret.spatch"

Signed-off-by: Thomas Meyer <[email protected]>
---

diff -u -p a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1795,7 +1795,7 @@ static int ap_poll_thread_start(void)
mutex_lock(&ap_poll_thread_mutex);
if (!ap_poll_kthread) {
ap_poll_kthread = kthread_run(ap_poll_thread, NULL, "appoll");
- rc = IS_ERR(ap_poll_kthread) ? PTR_ERR(ap_poll_kthread) : 0;
+ rc = PTR_RET(ap_poll_kthread);
if (rc)
ap_poll_kthread = NULL;
}
@@ -1904,7 +1904,7 @@ int __init ap_module_init(void)

/* Create /sys/devices/ap. */
ap_root_device = root_device_register("ap");
- rc = IS_ERR(ap_root_device) ? PTR_ERR(ap_root_device) : 0;
+ rc = PTR_RET(ap_root_device);
if (rc)
goto out_bus;

2013-06-10 15:23:37

by Heiko Carstens

Subject: Re: [PATCH] s390/ap: Cocci spatch "ptr_ret.spatch"

On Sat, Jun 01, 2013 at 11:51:13AM +0200, Thomas Meyer wrote:
>
> Signed-off-by: Thomas Meyer <[email protected]>
> ---
>
> diff -u -p a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
> --- a/drivers/s390/crypto/ap_bus.c
> +++ b/drivers/s390/crypto/ap_bus.c
> @@ -1795,7 +1795,7 @@ static int ap_poll_thread_start(void)
> mutex_lock(&ap_poll_thread_mutex);
> if (!ap_poll_kthread) {
> ap_poll_kthread = kthread_run(ap_poll_thread, NULL, "appoll");
> - rc = IS_ERR(ap_poll_kthread) ? PTR_ERR(ap_poll_kthread) : 0;
> + rc = PTR_RET(ap_poll_kthread);
> if (rc)
> ap_poll_kthread = NULL;
> }
> @@ -1904,7 +1904,7 @@ int __init ap_module_init(void)
>
> /* Create /sys/devices/ap. */
> ap_root_device = root_device_register("ap");
> - rc = IS_ERR(ap_root_device) ? PTR_ERR(ap_root_device) : 0;
> + rc = PTR_RET(ap_root_device);
> if (rc)
> goto out_bus;

Applied all you s390 related patches. Thanks.