Revert "gpio: pxa: set initcall level to module init" [Linux 3.9]

This Linux kernel change "Revert “gpio: pxa: set initcall level to module init”" is included in the Linux 3.9 release. This change is authored by Linus Walleij <linus.walleij [at] linaro.org> on Wed Apr 24 21:41:20 2013 +0200. The commit for this change in Linux stable tree is cf3fa17 (patch).

Revert "gpio: pxa: set initcall level to module init"

This reverts commit 6c7e660a27da7494c670bfba21cfeba30457656c.

The commit causes breakage on several older PXA machines.

Reported-by: Mike Dunn <mikedunn@newsguy.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

There are 7 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/gpio/gpio-pxa.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 9cc108d..8325f58 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -642,7 +642,12 @@ static int pxa_gpio_probe(struct platform_device *pdev)
        .of_match_table = of_match_ptr(pxa_gpio_dt_ids),
    },
 };
-module_platform_driver(pxa_gpio_driver);
+
+static int __init pxa_gpio_init(void)
+{
+   return platform_driver_register(&pxa_gpio_driver);
+}
+postcore_initcall(pxa_gpio_init);

 #ifdef CONFIG_PM
 static int pxa_gpio_suspend(void)

Leave a Reply

Your email address will not be published. Required fields are marked *