2012-02-07 12:41:28

by Danny Kukawka

Subject: [PATCH v2] cs5535-mfgpt: don't call __init function from __devinit

Fix scan_timers() and reset_all_timers() to be __devinit
and not __init since the function get called from
cs5535_mfgpt_probe which is __devinit.

v2: set also reset_all_timers() to __devinit

Signed-off-by: Danny Kukawka <[email protected]>
---
drivers/misc/cs5535-mfgpt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index bc685bf..f505a40 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(cs5535_mfgpt_write);
* Jordan tells me that he and Mitch once played w/ it, but it's unclear
* what the results of that were (and they experienced some instability).
*/
-static void __init reset_all_timers(void)
+static void __devinit reset_all_timers(void)
{
uint32_t val, dummy;

@@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
* In other cases (such as with VSAless OpenFirmware), the system firmware
* leaves timers available for us to use.
*/
-static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
+static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
{
struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
unsigned long flags;
--
1.7.7.3

2012-02-07 18:10:29

by Andres Salomon

Subject: Re: [PATCH v2] cs5535-mfgpt: don't call __init function from __devinit

On Tue, 7 Feb 2012 13:41:10 +0100
Danny Kukawka <[email protected]> wrote:

> Fix scan_timers() and reset_all_timers() to be __devinit
> and not __init since the function get called from
> cs5535_mfgpt_probe which is __devinit.
>
> v2: set also reset_all_timers() to __devinit
>
> Signed-off-by: Danny Kukawka <[email protected]>


Acked-by: Andres Salomon <[email protected]>

Thanks!


> ---
> drivers/misc/cs5535-mfgpt.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
> index bc685bf..f505a40 100644
> --- a/drivers/misc/cs5535-mfgpt.c
> +++ b/drivers/misc/cs5535-mfgpt.c
> @@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(cs5535_mfgpt_write);
> * Jordan tells me that he and Mitch once played w/ it, but it's
> unclear
> * what the results of that were (and they experienced some
> instability). */
> -static void __init reset_all_timers(void)
> +static void __devinit reset_all_timers(void)
> {
> uint32_t val, dummy;
>
> @@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
> * In other cases (such as with VSAless OpenFirmware), the system
> firmware
> * leaves timers available for us to use.
> */
> -static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
> +static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
> {
> struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
> unsigned long flags;