Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...

[linux-2.6-block.git] / drivers / rtc / rtc-max8998.c

diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index 042a8734bd28b6e8d4d001e06668a2feb37ee763..f098ad8382de021a7a66a442680c42d9393d7af6 100644 (file)
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -274,7 +274,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(info->rtc_dev)) {
                ret = PTR_ERR(info->rtc_dev);
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-               goto out_rtc;
+               return ret;
        }
 
        if (!max8998->irq_domain)
@@ -302,15 +302,6 @@ no_irq:
        }
 
        return 0;
-
-out_rtc:
-       platform_set_drvdata(pdev, NULL);
-       return ret;
-}
-
-static int max8998_rtc_remove(struct platform_device *pdev)
-{
-       return 0;
 }
 
 static const struct platform_device_id max8998_rtc_id[] = {
@@ -325,7 +316,6 @@ static struct platform_driver max8998_rtc_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = max8998_rtc_probe,
-       .remove         = max8998_rtc_remove,
        .id_table       = max8998_rtc_id,
 };