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

diff -u -p a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -1097,7 +1097,7 @@ static __init int sclp_initcall(void)
        if (rc)
                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;
        rc = atomic_notifier_chain_register(&panic_notifier_list,
diff -u -p a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -668,7 +668,7 @@ static int __init sclp_detect_standby_me
        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 -u -p a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -77,7 +77,7 @@ struct tape_class_device *register_tape_
        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(


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to