From: Danny Kukawka Date: Thu, 2 Feb 2012 13:20:29 +0000 (+0100) Subject: cs5535-mfgpt: don't call __init function from __devinit X-Git-Tag: firefly_0821_release~7541^2~1600 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e0f8bcb6766ac0960ec0b92e92c62db48f2a1716;p=firefly-linux-kernel-4.4.55.git cs5535-mfgpt: don't call __init function from __devinit commit 474de3bbadd9cb75ffc32cc759c40d868343d46c upstream. Fix scan_timers() to be __devinit and not __init since the function get called from cs5535_mfgpt_probe which is __devinit. Signed-off-by: Danny Kukawka Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index bc685bfc4c33..87a390de054c 100644 --- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c @@ -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;