lkml.org 
[lkml]   [2008]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] [WATCHDOG] mpc8xxx_wdt: fix modular build
On Wed, Aug 13, 2008 at 04:23:41PM +0400, Anton Vorontsov wrote:
>...
> --- a/drivers/watchdog/mpc8xxx_wdt.c
> +++ b/drivers/watchdog/mpc8xxx_wdt.c
> @@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type {
> };
>
> static struct mpc8xxx_wdt __iomem *wd_base;
> +static int mpc8xxx_wdt_init_late(void);
>
> static u16 timeout = 0xffff;
> module_param(timeout, ushort, 0);
> @@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
> else
> timeout_sec = timeout / freq;
>
> +#ifdef CONFIG_8xxx_WDT_MODULE
> + ret = mpc8xxx_wdt_init_late();
> + if (ret)
> + goto err_unmap;
> +#endif

In mpc8xxx_wdt_probe()?

Isn't mpc8xxx_wdt_init() the correct place?

> pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
> "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
> timeout_sec);
> @@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = {
> * very early to start pinging the watchdog (misc devices are not yet
> * available), and later module_init() just registers the misc device.
> */
> -static int __init mpc8xxx_wdt_init_late(void)
> +static int mpc8xxx_wdt_init_late(void)
> {
> int ret;
>
> @@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void)
> }
> return 0;
> }
> +#ifndef CONFIG_8xxx_WDT_MODULE

Your #ifdef is correct, but "#ifdef MODULE" would express this better.

> module_init(mpc8xxx_wdt_init_late);
> +#endif
>
> static int __init mpc8xxx_wdt_init(void)
> {

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed



\
 
 \ /
  Last update: 2008-08-13 16:37    [W:0.037 / U:8.596 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site