Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / drivers / rtc / rtc-test.c

diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 7746e65..8f86fa9 100644 (file)
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -104,20 +104,17 @@ static int test_probe(struct platform_device *plat_dev)
        rtc = devm_rtc_device_register(&plat_dev->dev, "test",
                                &test_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc)) {
-               err = PTR_ERR(rtc);
-               return err;
+               return PTR_ERR(rtc);
        }
 
        err = device_create_file(&plat_dev->dev, &dev_attr_irq);
        if (err)
-               goto err;
+               dev_err(&plat_dev->dev, "Unable to create sysfs entry: %s\n",
+                       dev_attr_irq.attr.name);
 
        platform_set_drvdata(plat_dev, rtc);
 
        return 0;
-
-err:
-       return err;
 }
 
 static int test_remove(struct platform_device *plat_dev)
@@ -132,7 +129,6 @@ static struct platform_driver test_driver = {
        .remove = test_remove,
        .driver = {
                .name = "rtc-test",
-               .owner = THIS_MODULE,
        },
 };