2009-01-18 13:32:51

by Philipp Zabel

[permalink] [raw]
Subject: [PATCH] regulator: move bq24022 init back to module_init instead of subsys_initcall

This workaround was needed when regulator/ was not linked before both
power/ and usb/otg/ in drivers/Makefile. Now that it is even linked
before mfd/, this patch makes sure that bq24022 isn't probed before the
GPIO expander is set up.

Signed-off-by: Philipp Zabel <[email protected]>
---
drivers/regulator/bq24022.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index ebae7c0..21682d5 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -165,11 +165,7 @@ static void __exit bq24022_exit(void)
platform_driver_unregister(&bq24022_driver);
}

-/*
- * make sure this is probed before gpio_vbus and pda_power,
- * but after asic3 or other GPIO expander drivers.
- */
-subsys_initcall(bq24022_init);
+module_init(bq24022_init);
module_exit(bq24022_exit);

MODULE_AUTHOR("Philipp Zabel");
--
1.5.6.5


2009-01-18 13:50:49

by Liam Girdwood

[permalink] [raw]
Subject: Re: [PATCH] regulator: move bq24022 init back to module_init instead of subsys_initcall

On Sun, 2009-01-18 at 14:32 +0100, Philipp Zabel wrote:
> This workaround was needed when regulator/ was not linked before both
> power/ and usb/otg/ in drivers/Makefile. Now that it is even linked
> before mfd/, this patch makes sure that bq24022 isn't probed before the
> GPIO expander is set up.
>
> Signed-off-by: Philipp Zabel <[email protected]>
> ---
> drivers/regulator/bq24022.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>

Applied.

Thanks

Liam