3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 97319d692b04..3e4fb4e858da 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -1170,7 +1170,7 @@ static __init int sclp_initcall(void)
                 return rc;
 
         sclp_pdev = platform_device_register_simple("sclp", -1, NULL, 0);
-        rc = IS_ERR(sclp_pdev) ? PTR_ERR(sclp_pdev) : 0;
+        rc = PTR_RET(sclp_pdev);
         if (rc)
                 goto fail_platform_driver_unregister;
 
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 657b0348579c..8cd34bf644b3 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -668,7 +668,7 @@ static int __init sclp_detect_standby_memory(void)
         if (rc)
                 goto out;
         sclp_pdev = platform_device_register_simple("sclp_mem", -1, NULL, 0);
-        rc = IS_ERR(sclp_pdev) ? PTR_ERR(sclp_pdev) : 0;
+        rc = PTR_RET(sclp_pdev);
         if (rc)
                 goto out_driver;
         sclp_add_standby_memory();
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 54b3c79203f5..91c3c642c76e 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 = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
+        rc = PTR_RET(tcd->class_device);
         if (rc)
                 goto fail_with_cdev;
         rc = sysfs_create_link(