power/reset: at91-reset: remove useless at91_reset_platform_probe()
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tue, 11 Aug 2015 09:12:46 +0000 (11:12 +0200)
committerSebastian Reichel <sre@kernel.org>
Tue, 22 Sep 2015 13:18:52 +0000 (15:18 +0200)
Since all the at91 platforms are now DT only, at91_reset_platform_probe()
is now useless, remove it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/reset/at91-reset.c

index c378d4ec826f4248155cb9f786697caba7e307ad..16e12bd507a1e51a26e38100b4c6669392a5a398 100644 (file)
@@ -178,11 +178,11 @@ static struct notifier_block at91_restart_nb = {
        .priority = 192,
 };
 
-static int at91_reset_of_probe(struct platform_device *pdev)
+static int at91_reset_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match;
        struct device_node *np;
-       int idx = 0;
+       int ret, idx = 0;
 
        at91_rstc_base = of_iomap(pdev->dev.of_node, 0);
        if (!at91_rstc_base) {
@@ -204,49 +204,8 @@ static int at91_reset_of_probe(struct platform_device *pdev)
 
        match = of_match_node(at91_reset_of_match, pdev->dev.of_node);
        at91_restart_nb.notifier_call = match->data;
-       return register_restart_handler(&at91_restart_nb);
-}
-
-static int at91_reset_platform_probe(struct platform_device *pdev)
-{
-       const struct platform_device_id *match;
-       struct resource *res;
-       int idx = 0;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       at91_rstc_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(at91_rstc_base)) {
-               dev_err(&pdev->dev, "Could not map reset controller address\n");
-               return PTR_ERR(at91_rstc_base);
-       }
-
-       for (idx = 0; idx < 2; idx++) {
-               res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 );
-               at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start,
-                                                  resource_size(res));
-               if (!at91_ramc_base[idx]) {
-                       dev_err(&pdev->dev, "Could not map ram controller address\n");
-                       return -ENOMEM;
-               }
-       }
-
-       match = platform_get_device_id(pdev);
-       at91_restart_nb.notifier_call =
-               (int (*)(struct notifier_block *,
-                        unsigned long, void *)) match->driver_data;
-
-       return register_restart_handler(&at91_restart_nb);
-}
-
-static int at91_reset_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       if (pdev->dev.of_node)
-               ret = at91_reset_of_probe(pdev);
-       else
-               ret = at91_reset_platform_probe(pdev);
 
+       ret = register_restart_handler(&at91_restart_nb);
        if (ret)
                return ret;