Merge tag 'md-3.11' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-nuc900.c

diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index f5dfb6e5e7d9b927e69e52cd3bce2ae801c1171e..22861c5e0c596fff3c87182b1beb1f1c9cdaf109 100644 (file)
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -234,11 +234,6 @@ static int __init nuc900_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "platform_get_resource failed\n");
-               return -ENXIO;
-       }
-
        nuc900_rtc->rtc_reg = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(nuc900_rtc->rtc_reg))
                return PTR_ERR(nuc900_rtc->rtc_reg);
@@ -265,15 +260,7 @@ static int __init nuc900_rtc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __exit nuc900_rtc_remove(struct platform_device *pdev)
-{
-       platform_set_drvdata(pdev, NULL);
-
-       return 0;
-}
-
 static struct platform_driver nuc900_rtc_driver = {
-       .remove         = __exit_p(nuc900_rtc_remove),
        .driver         = {
                .name   = "nuc900-rtc",
                .owner  = THIS_MODULE,