lkml.org 
[lkml]   [2023]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] watchdog: starfive: add lock annotations to fix context imbalances
On Wed, Nov 22, 2023 at 08:51:18AM +0000, Ben Dooks wrote:
> Add the necessary __acquires() and __releases() to the functions
> that take and release the wdt lock to avoid the following sparse
> warnings:
>
> drivers/watchdog/starfive-wdt.c:204:13: warning: context imbalance in 'starfive_wdt_unlock' - wrong count at exit
> drivers/watchdog/starfive-wdt.c:212:9: warning: context imbalance in 'starfive_wdt_lock' - unexpected unlock
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/watchdog/starfive-wdt.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
> index 5f501b41faf9..49b38ecc092d 100644
> --- a/drivers/watchdog/starfive-wdt.c
> +++ b/drivers/watchdog/starfive-wdt.c
> @@ -202,12 +202,14 @@ static u32 starfive_wdt_ticks_to_sec(struct starfive_wdt *wdt, u32 ticks)
>
> /* Write unlock-key to unlock. Write other value to lock. */
> static void starfive_wdt_unlock(struct starfive_wdt *wdt)
> + __acquires(&wdt->lock)
> {
> spin_lock(&wdt->lock);
> writel(wdt->variant->unlock_key, wdt->base + wdt->variant->unlock);
> }
>
> static void starfive_wdt_lock(struct starfive_wdt *wdt)
> + __releases(&wdt->lock)
> {
> writel(~wdt->variant->unlock_key, wdt->base + wdt->variant->unlock);
> spin_unlock(&wdt->lock);
> --
> 2.37.2.352.g3c44437643
>
>

\
 
 \ /
  Last update: 2023-12-12 17:55    [W:0.231 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site