On Mon, Nov 19, 2012 at 03:10:42PM +0100, Fabio Porcedda wrote: > Move the min_timeout initialization inside the orion_wdt definition. > > Only compile tested. > > Signed-off-by: Fabio Porcedda <fabio.porcedda@xxxxxxxxx> > Cc: Jason Cooper <jason@xxxxxxxxxxxxxx> > Cc: Andrew Lunn <andrew@xxxxxxx> Acked-by: Jason Cooper <jason@xxxxxxxxxxxxxx> thx, Jason. > --- > drivers/watchdog/orion_wdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c > index 446a3e9..3b4e228 100644 > --- a/drivers/watchdog/orion_wdt.c > +++ b/drivers/watchdog/orion_wdt.c > @@ -140,6 +140,7 @@ static const struct watchdog_ops orion_wdt_ops = { > static struct watchdog_device orion_wdt = { > .info = &orion_wdt_info, > .ops = &orion_wdt_ops, > + .min_timeout = 1, > }; > > static int __devinit orion_wdt_probe(struct platform_device *pdev) > @@ -162,7 +163,6 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) > > wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; > > - orion_wdt.min_timeout = 1; > orion_wdt.timeout = wdt_max_duration; > orion_wdt.max_timeout = wdt_max_duration; > watchdog_init_timeout(&orion_wdt, heartbeat, pdev->dev.of_node); > -- > 1.8.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html