On Tue, Nov 29, 2011 at 12:14:30PM +0100, Wim Van Sebroeck wrote: > Add two nowayout helpers for the Watchdog Timer Driver Kernel API. > > Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx> > --- > diff --git a/Documentation/watchdog/00-INDEX b/Documentation/watchdog/00-INDEX > index fc51128..fc9082a 100644 > --- a/Documentation/watchdog/00-INDEX > +++ b/Documentation/watchdog/00-INDEX > @@ -1,5 +1,7 @@ > 00-INDEX > - this file. > +convert_drivers_to_kernel_api.txt > + - how-to for converting old watchdog drivers to the new kernel API. Since the howto needs a NOWAYOUT-update as well, I suggest I'll send a patch for that and take care of the missing index-entry there? > @@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are: > * WDOG_NO_WAY_OUT: this bit stores the nowayout setting for the watchdog. > If this bit is set then the watchdog timer will not be able to stop. > > +To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog > +timer device) you can either: > +* set it statically in your watchdog_device struct with > + .status = WATCHDOG_NOWAYOUT_INIT_STATUS, > + (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or > +* use the following helper function: > +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) > + I think one level of indentation would be helpful here so it visually belongs to the WDOG_NO_WAY_OUT paragraph? > +/* Use the following function to set the nowayout feature */ > +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) > +{ > + if (nowayout) > + set_bit(WDOG_NO_WAY_OUT, &wdd->status); > +} > + Other than that: Reviewed-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> So, shall I fix the s3c-driver based on that or will you do? Thanks, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature