| Message ID | 1553668971-18801-1-git-send-email-hpeter+linux_kernel@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [V2,1/2] watchdog: f71808e_wdt: separate declaration and assignment | expand |
On Wed, Mar 27, 2019 at 02:42:50PM +0800, Ji-Ze Hong (Peter Hong) wrote: > Separate declaration and assignment in watchdog_start() > > Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Note though that it would be much more valuable if you could consider converting the driver to use the watchdog subsystem instead of trying to clean up the current code. Thanks, Guenter > --- > drivers/watchdog/f71808e_wdt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c > index 9a1c761258ce..bd2ced9f39f4 100644 > --- a/drivers/watchdog/f71808e_wdt.c > +++ b/drivers/watchdog/f71808e_wdt.c > @@ -338,8 +338,10 @@ static int f71862fg_pin_configure(unsigned short ioaddr) > > static int watchdog_start(void) > { > + int err; > + > /* Make sure we don't die as soon as the watchdog is enabled below */ > - int err = watchdog_keepalive(); > + err = watchdog_keepalive(); > if (err) > return err; > > -- > 2.7.4 >
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index 9a1c761258ce..bd2ced9f39f4 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -338,8 +338,10 @@ static int f71862fg_pin_configure(unsigned short ioaddr) static int watchdog_start(void) { + int err; + /* Make sure we don't die as soon as the watchdog is enabled below */ - int err = watchdog_keepalive(); + err = watchdog_keepalive(); if (err) return err;
Separate declaration and assignment in watchdog_start() Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com> --- drivers/watchdog/f71808e_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)