| Message ID | 20200529012428.84684-1-k.bumsik@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: test_bit() => watchdog_active() | expand |
On Fri, May 29, 2020 at 10:24:28AM +0900, Bumsik Kim wrote: > Use the dedicated function watchdog_active() > instead of the generic test_bit() function. > > It is done using the following Coccinelle script: > > @@ > identifier wdd; > @@ > - test_bit(WDOG_ACTIVE, &wdd->status) > + watchdog_active(wdd) > > Signed-off-by: Bumsik Kim <k.bumsik@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/watchdog_dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c > index 7e4cd34a8c20..3ae608d78af2 100644 > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -916,7 +916,7 @@ static int watchdog_release(struct inode *inode, struct file *file) > * or if WDIOF_MAGICCLOSE is not set. If nowayout was set then > * watchdog_stop will fail. > */ > - if (!test_bit(WDOG_ACTIVE, &wdd->status)) > + if (!watchdog_active(wdd)) > err = 0; > else if (test_and_clear_bit(_WDOG_ALLOW_RELEASE, &wd_data->status) || > !(wdd->info->options & WDIOF_MAGICCLOSE)) > -- > 2.26.2 >
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 7e4cd34a8c20..3ae608d78af2 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -916,7 +916,7 @@ static int watchdog_release(struct inode *inode, struct file *file) * or if WDIOF_MAGICCLOSE is not set. If nowayout was set then * watchdog_stop will fail. */ - if (!test_bit(WDOG_ACTIVE, &wdd->status)) + if (!watchdog_active(wdd)) err = 0; else if (test_and_clear_bit(_WDOG_ALLOW_RELEASE, &wd_data->status) || !(wdd->info->options & WDIOF_MAGICCLOSE))
Use the dedicated function watchdog_active() instead of the generic test_bit() function. It is done using the following Coccinelle script: @@ identifier wdd; @@ - test_bit(WDOG_ACTIVE, &wdd->status) + watchdog_active(wdd) Signed-off-by: Bumsik Kim <k.bumsik@gmail.com> --- drivers/watchdog/watchdog_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)