Skip to contentSkip to conversation

s390/ap: Cocci spatch "ptr_ret.spatch"

PATCH Applied Thomas Meyer 2 participants 2 messages Jun 1, 2013 – Jun 10, 2013

Subsystems (2)
s390 s390 zcrypt and pkey driver and AP bus
lore
Share & tools
lore

Thomas Meyer

author
#0 lore raw

PATCH 1/1 s390/ap: Cocci spatch "ptr_ret.spatch"

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

---

drivers/s390/crypto/ap_bus.c +2 -2
diff -u -p 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
#1 lore raw
Quoted 17 lines · Thomas Meyer
Signed-off-by Thomas Meyer <[email protected]>

---

diff -u -p a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c

drivers/s390/crypto/ap_bus.c +1 -1
@@ -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;
 	}

drivers/s390/crypto/ap_bus.c int __init ap_module_init(void) · line 1909

Quoted 7 lines
drivers/s390/crypto/ap_bus.c +1 -1
@@ -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.